diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEditChar.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEditChar.java index 09a090ab23124f8d560753ec497da20967eed01a..7f60cc7dd1cbae6060c499c6daaeb8d492294366 100644 --- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEditChar.java +++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEditChar.java @@ -251,7 +251,7 @@ public class AdminEditChar implements IAdminCommandHandler { L2Object target = activeChar.getTarget(); if (target instanceof L2PcInstance) { L2PcInstance player = (L2PcInstance) target; - player.setRecomHave(recVal); + player.getRecSystem().setHave(recVal); player.broadcastUserInfo(); player.sendPacket(new UserInfo(player)); player.sendPacket(new ExBrExtraUserInfo(player)); diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/BonusCountUp.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/BonusCountUp.java index 698de9ce0d0c8e6761744842e770c56ad58b6aa4..834d77c38aaa73ab5aacf979f5e71915121ebdde 100644 --- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/BonusCountUp.java +++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/BonusCountUp.java @@ -54,12 +54,12 @@ public final class BonusCountUp extends AbstractEffect { final L2PcInstance player = info.getEffector().getActingPlayer(); if (player != null) { int recomHaveIncrease = _amount; - if ((player.getRecomHave() + _amount) >= 255) { - recomHaveIncrease = 255 - player.getRecomHave(); + if ((player.getRecSystem().getHave() + _amount) >= 255) { + recomHaveIncrease = 255 - player.getRecSystem().getHave(); } if (recomHaveIncrease > 0) { - player.setRecomHave(player.getRecomHave() + recomHaveIncrease); + player.getRecSystem().setHave(player.getRecSystem().getHave() + recomHaveIncrease); SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_OBTAINED_S1_RECOMMENDATIONS); sm.addInt(recomHaveIncrease); diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/BonusTimeLimitUp.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/BonusTimeLimitUp.java index a57acc36bf1366d722c1bb2e41182bc49d07091b..53a01feebfd53f8a91c07f5cf8fe4be76f7d5163 100644 --- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/BonusTimeLimitUp.java +++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/BonusTimeLimitUp.java @@ -25,6 +25,7 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect; import com.l2jserver.gameserver.model.effects.L2EffectType; import com.l2jserver.gameserver.model.skills.BuffInfo; import com.l2jserver.gameserver.model.zone.ZoneId; +import com.l2jserver.gameserver.network.serverpackets.UserInfo; /** * Bonus Time Limit Up effect implementation. @@ -47,18 +48,15 @@ public final class BonusTimeLimitUp extends AbstractEffect { @Override public void onStart(BuffInfo info) { - L2PcInstance activeChar = info.getEffected().getActingPlayer(); - if ((activeChar != null) && activeChar.isPlayer()) { + if (info.getEffected().isPlayer()) { info.setAbnormalTime(_time); - activeChar.setRecomTimerActive(false); + info.getEffected().getActingPlayer().getRecSystem().stopBonusTask(false); + info.getEffected().getActingPlayer().sendPacket(new UserInfo(info.getEffected().getActingPlayer())); } } @Override public void onExit(BuffInfo info) { - L2PcInstance activeChar = info.getEffected().getActingPlayer(); - if (!activeChar.isInsideZone(ZoneId.PEACE)) { - activeChar.setRecomTimerActive(true); - } + info.getEffected().getActingPlayer().getRecSystem().startBonusTask(false); } }