From 1802c069d3ebe934f2835083f81614fba2778331 Mon Sep 17 00:00:00 2001
From: HorridoJoho <HorridoJoho@l2jserver.com>
Date: Sun, 2 Jan 2022 16:34:09 +0100
Subject: [PATCH] Fixups to work with core refactoring.
---
.../handlers/admincommandhandlers/AdminEditChar.java | 2 +-
.../effecthandlers/instant/BonusCountUp.java | 6 +++---
.../effecthandlers/pump/BonusTimeLimitUp.java | 12 +++++-------
3 files changed, 9 insertions(+), 11 deletions(-)
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 09a090ab23..7f60cc7dd1 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 698de9ce0d..834d77c38a 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 a57acc36bf..53a01feebf 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);
}
}
--
GitLab