diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 3f3f308c99..fa00bdbd65 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -721,7 +721,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -789,7 +789,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -818,7 +818,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -853,7 +853,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -930,7 +930,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -963,7 +963,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1013,7 +1013,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 6922831a4e..088c7c3c8b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -717,7 +717,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -785,7 +785,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -814,7 +814,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -849,7 +849,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -926,7 +926,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -959,7 +959,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1009,7 +1009,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 6922831a4e..088c7c3c8b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -717,7 +717,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -785,7 +785,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -814,7 +814,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -849,7 +849,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -926,7 +926,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -959,7 +959,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1009,7 +1009,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 6922831a4e..088c7c3c8b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -717,7 +717,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -785,7 +785,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -814,7 +814,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -849,7 +849,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -926,7 +926,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -959,7 +959,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1009,7 +1009,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4b0edb8c9e..75888e4833 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -705,7 +705,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -773,7 +773,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -802,7 +802,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -837,7 +837,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -914,7 +914,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -947,7 +947,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -997,7 +997,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4b0edb8c9e..75888e4833 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -705,7 +705,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -773,7 +773,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -802,7 +802,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -837,7 +837,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -914,7 +914,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -947,7 +947,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -997,7 +997,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4b0edb8c9e..75888e4833 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -705,7 +705,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -773,7 +773,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -802,7 +802,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -837,7 +837,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -914,7 +914,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -947,7 +947,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -997,7 +997,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0aa18ff152..ee2b8445cd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -716,7 +716,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -784,7 +784,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -813,7 +813,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -848,7 +848,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -925,7 +925,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -958,7 +958,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1008,7 +1008,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0aa18ff152..ee2b8445cd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -716,7 +716,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -784,7 +784,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -813,7 +813,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -848,7 +848,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -925,7 +925,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -958,7 +958,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1008,7 +1008,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0aa18ff152..ee2b8445cd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -716,7 +716,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -784,7 +784,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -813,7 +813,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -848,7 +848,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -925,7 +925,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -958,7 +958,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1008,7 +1008,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 6eccfeeac8..cff3ecf2b8 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -716,7 +716,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -784,7 +784,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -813,7 +813,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -848,7 +848,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -925,7 +925,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -958,7 +958,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1008,7 +1008,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 025aeb11b9..e4260628ce 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -398,7 +398,7 @@ public class IstinaCavern extends AbstractInstance } else if (skillId == ISTINA_ERUPTION_SKILL.getSkillId()) { - ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingInt(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> + ((Attackable) npc).getAggroList().values().stream().sorted(Comparator.comparingLong(AggroInfo::getHate)).map(AggroInfo::getAttacker).limit(5).forEach(character -> { final Npc eruption = addSpawn(INVISIBLE_NPC, Util.getRandomPosition(character, 150, 150), false, 0, false, instance.getId()); eruption.getVariables().set("ERUPTION_TARGET", character); diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java index e36c0dc6b4..bda42a3ce2 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -722,7 +722,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -790,7 +790,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -819,7 +819,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -854,7 +854,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -931,7 +931,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -964,7 +964,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1014,7 +1014,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 9d57c9446a..470b80f213 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -78,7 +78,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = aggroList.get(Rnd.get(aggroList.size())); - final int hate = effectedMob.getHating(info.getEffector()); + final long hate = effectedMob.getHating(info.getEffector()); effectedMob.stopHating(info.getEffector()); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 894c0e8854..adf00910c1 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -61,7 +61,7 @@ public class TransferHate extends AbstractEffect return; } - final int hate = hater.getHating(info.getEffector()); + final long hate = hater.getHating(info.getEffector()); if (hate <= 0) { return; diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 517cd38302..70dccb5dd0 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -477,7 +477,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -547,7 +547,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(target); + final long hating = npc.getHating(target); if (hating == 0) { npc.addDamageHate(target, 0, 0); @@ -578,7 +578,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java index 3b48e23297..4b927edf17 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java @@ -275,7 +275,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable if (hated != null) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -493,7 +493,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable { break; } - + boolean useSkillSelf = true; if (sk.isContinuous() && !sk.isDebuff() && _actor.isAffectedBySkill(sk.getId())) { diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 3ae3b9cf0c..7341ac1610 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -670,7 +670,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -730,7 +730,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature attacker, int damage, int aggroValue) + public void addDamageHate(Creature attacker, long damage, long aggroValue) { if ((attacker == null) || (attacker == this)) { @@ -750,7 +750,7 @@ public class Attackable extends Npc // Traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; final Player targetPlayer = attacker.getActingPlayer(); if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { @@ -786,7 +786,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (getAI() instanceof SiegeGuardAI) { @@ -872,7 +872,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -905,7 +905,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -963,7 +963,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { @@ -998,6 +998,7 @@ public class Attackable extends Npc ai.stopHate(); return 0; } + return ai.getHate(); } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index 510cfecd3b..234e542e21 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -164,7 +164,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java index 4692983811..5b2acc9bce 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java @@ -74,7 +74,7 @@ public class QuestGuard extends Guard } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!_isPassive && !attacker.isPlayer()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 9d57c9446a..470b80f213 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -78,7 +78,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = aggroList.get(Rnd.get(aggroList.size())); - final int hate = effectedMob.getHating(info.getEffector()); + final long hate = effectedMob.getHating(info.getEffector()); effectedMob.stopHating(info.getEffector()); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 894c0e8854..adf00910c1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -61,7 +61,7 @@ public class TransferHate extends AbstractEffect return; } - final int hate = hater.getHating(info.getEffector()); + final long hate = hater.getHating(info.getEffector()); if (hate <= 0) { return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 517cd38302..70dccb5dd0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -477,7 +477,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -547,7 +547,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(target); + final long hating = npc.getHating(target); if (hating == 0) { npc.addDamageHate(target, 0, 0); @@ -578,7 +578,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java index 8bf4d8c1dd..14974dbb0b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java @@ -284,7 +284,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable if (hated != null) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java index 3b48e23297..4b927edf17 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java @@ -275,7 +275,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable if (hated != null) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -493,7 +493,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable { break; } - + boolean useSkillSelf = true; if (sk.isContinuous() && !sk.isDebuff() && _actor.isAffectedBySkill(sk.getId())) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9fefa8ed09..e2d8dcdc1d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -671,7 +671,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -731,7 +731,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature attacker, int damage, int aggroValue) + public void addDamageHate(Creature attacker, long damage, long aggroValue) { if ((attacker == null) || (attacker == this)) { @@ -751,7 +751,7 @@ public class Attackable extends Npc // Traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; final Player targetPlayer = attacker.getActingPlayer(); if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { @@ -787,7 +787,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if ((getAI() instanceof SiegeGuardAI) || (getAI() instanceof FortSiegeGuardAI)) { @@ -873,7 +873,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -906,7 +906,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -964,7 +964,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { @@ -999,6 +999,7 @@ public class Attackable extends Npc ai.stopHate(); return 0; } + return ai.getHate(); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a147550126..7461f55b84 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -174,7 +174,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 73bd9949e4..60380ec91e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -67,7 +67,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java index 4692983811..5b2acc9bce 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java @@ -74,7 +74,7 @@ public class QuestGuard extends Guard } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!_isPassive && !attacker.isPlayer()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 9d57c9446a..470b80f213 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -78,7 +78,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = aggroList.get(Rnd.get(aggroList.size())); - final int hate = effectedMob.getHating(info.getEffector()); + final long hate = effectedMob.getHating(info.getEffector()); effectedMob.stopHating(info.getEffector()); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 894c0e8854..adf00910c1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -61,7 +61,7 @@ public class TransferHate extends AbstractEffect return; } - final int hate = hater.getHating(info.getEffector()); + final long hate = hater.getHating(info.getEffector()); if (hate <= 0) { return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 517cd38302..70dccb5dd0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -477,7 +477,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -547,7 +547,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(target); + final long hating = npc.getHating(target); if (hating == 0) { npc.addDamageHate(target, 0, 0); @@ -578,7 +578,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java index 8bf4d8c1dd..14974dbb0b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java @@ -284,7 +284,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable if (hated != null) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java index 3b48e23297..4b927edf17 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java @@ -275,7 +275,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable if (hated != null) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -493,7 +493,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable { break; } - + boolean useSkillSelf = true; if (sk.isContinuous() && !sk.isDebuff() && _actor.isAffectedBySkill(sk.getId())) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9fefa8ed09..e2d8dcdc1d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -671,7 +671,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -731,7 +731,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature attacker, int damage, int aggroValue) + public void addDamageHate(Creature attacker, long damage, long aggroValue) { if ((attacker == null) || (attacker == this)) { @@ -751,7 +751,7 @@ public class Attackable extends Npc // Traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; final Player targetPlayer = attacker.getActingPlayer(); if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { @@ -787,7 +787,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if ((getAI() instanceof SiegeGuardAI) || (getAI() instanceof FortSiegeGuardAI)) { @@ -873,7 +873,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -906,7 +906,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -964,7 +964,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { @@ -999,6 +999,7 @@ public class Attackable extends Npc ai.stopHate(); return 0; } + return ai.getHate(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a147550126..7461f55b84 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -174,7 +174,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 73bd9949e4..60380ec91e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -67,7 +67,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java index 4692983811..5b2acc9bce 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/QuestGuard.java @@ -74,7 +74,7 @@ public class QuestGuard extends Guard } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!_isPassive && !attacker.isPlayer()) { diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java index e8bdd01051..15bc081450 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -703,7 +703,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -771,7 +771,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -800,7 +800,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -835,7 +835,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -912,7 +912,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -945,7 +945,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -995,7 +995,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 69c1d030ea..03c54090c1 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -717,7 +717,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -785,7 +785,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -814,7 +814,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -849,7 +849,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -926,7 +926,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -959,7 +959,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1009,7 +1009,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 69c1d030ea..03c54090c1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -717,7 +717,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -785,7 +785,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -814,7 +814,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -849,7 +849,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -926,7 +926,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -959,7 +959,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1009,7 +1009,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 69c1d030ea..03c54090c1 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -717,7 +717,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -785,7 +785,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -814,7 +814,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -849,7 +849,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -926,7 +926,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -959,7 +959,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1009,7 +1009,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9250e5a750..b258674d82 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -717,7 +717,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -785,7 +785,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -814,7 +814,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -849,7 +849,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -926,7 +926,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -959,7 +959,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1009,7 +1009,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 2028a52bb1..114fe3d692 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -737,7 +737,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -805,7 +805,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -834,7 +834,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -869,7 +869,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -946,7 +946,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -979,7 +979,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1029,7 +1029,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 2028a52bb1..114fe3d692 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -737,7 +737,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -805,7 +805,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -834,7 +834,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -869,7 +869,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -946,7 +946,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -979,7 +979,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1029,7 +1029,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 2028a52bb1..114fe3d692 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -737,7 +737,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -805,7 +805,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -834,7 +834,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -869,7 +869,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -946,7 +946,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -979,7 +979,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1029,7 +1029,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 2028a52bb1..114fe3d692 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -737,7 +737,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -805,7 +805,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -834,7 +834,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -869,7 +869,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -946,7 +946,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -979,7 +979,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1029,7 +1029,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java index a6a334ef45..c2ed2578d0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 1a0717558a..2650059ad2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -721,7 +721,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -789,7 +789,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -818,7 +818,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -853,7 +853,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -930,7 +930,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -963,7 +963,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1013,7 +1013,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 725a2bc65a..426773554c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -750,7 +750,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -818,7 +818,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -847,7 +847,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -882,7 +882,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -959,7 +959,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -992,7 +992,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1042,7 +1042,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 2d0597bb06..7f6eb9e149 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -750,7 +750,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -818,7 +818,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -847,7 +847,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -882,7 +882,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -959,7 +959,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -992,7 +992,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1042,7 +1042,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java index ad211967e8..13808462d2 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -757,7 +757,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -825,7 +825,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -854,7 +854,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -889,7 +889,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -966,7 +966,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -999,7 +999,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1049,7 +1049,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) { diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 42f77d7d52..ede5cc9ade 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -84,7 +84,7 @@ public class RandomizeHate extends AbstractEffect // Choosing randomly a new target final Creature target = targetList.get(Rnd.get(targetList.size())); - final int hate = effectedMob.getHating(effector); + final long hate = effectedMob.getHating(effector); effectedMob.stopHating(effector); effectedMob.addDamageHate(target, 0, hate); } diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index b262d8cbb0..c866618241 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -66,7 +66,8 @@ public class TransferHate extends AbstractEffect { return; } - final int hate = hater.getHating(effector); + + final long hate = hater.getHating(effector); if (hate <= 0) { return; diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/ai/AttackableAI.java index f3a756c32d..93fac6e191 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -331,7 +331,7 @@ public class AttackableAI extends CreatureAI || (Config.FAKE_PLAYER_AGGRO_MONSTERS && t.isMonster() && !t.isFakePlayer()) // || (Config.FAKE_PLAYER_AGGRO_PLAYERS && t.isPlayer())) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); final double distance = npc.calculateDistance2D(t); if ((hating == 0) && (closestDistance > distance)) { @@ -392,7 +392,7 @@ public class AttackableAI extends CreatureAI { if (!npc.isFakePlayer() || (npc.isFakePlayer() && Config.FAKE_PLAYER_AGGRO_FPC)) { - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); if (hating == 0) { npc.addDamageHate(t, 0, 0); @@ -411,7 +411,7 @@ public class AttackableAI extends CreatureAI } // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int hating = npc.getHating(t); + final long hating = npc.getHating(t); // Add the attacker to the Attackable _aggroList with 0 damage and 1 hate if (hating == 0) @@ -442,7 +442,7 @@ public class AttackableAI extends CreatureAI if ((hated != null) && !npc.isCoreAIDisabled()) { // Get the hate level of the Attackable against this Creature target contained in _aggroList - final int aggro = npc.getHating(hated); + final long aggro = npc.getHating(hated); if ((aggro + _globalAggro) > 0) { // Set the Creature movement type to run and send Server->Client packet ChangeMoveType to all others Player @@ -1239,7 +1239,7 @@ public class AttackableAI extends CreatureAI } } - int searchValue = Integer.MIN_VALUE; + long searchValue = Long.MIN_VALUE; Creature creature = null; for (AggroInfo aggro : npc.getAggroList().values()) { diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/AggroInfo.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/AggroInfo.java index 427d59def3..43cd57517a 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/AggroInfo.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/AggroInfo.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; public class AggroInfo { private final Creature _attacker; - private int _hate = 0; - private int _damage = 0; + private long _hate = 0; + private long _damage = 0; public AggroInfo(Creature pAttacker) { @@ -37,12 +37,12 @@ public class AggroInfo return _attacker; } - public int getHate() + public long getHate() { return _hate; } - public int checkHate(Creature owner) + public long checkHate(Creature owner) { if (_attacker.isAlikeDead() || !_attacker.isSpawned() || !owner.isInSurroundingRegion(_attacker)) { @@ -51,9 +51,9 @@ public class AggroInfo return _hate; } - public void addHate(int value) + public void addHate(long value) { - _hate = (int) Math.min(_hate + (long) value, 999999999); + _hate = Math.min(_hate + value, Long.MAX_VALUE); } public void stopHate() @@ -61,14 +61,14 @@ public class AggroInfo _hate = 0; } - public int getDamage() + public long getDamage() { return _damage; } - public void addDamage(int value) + public void addDamage(long value) { - _damage = (int) Math.min(_damage + (long) value, 999999999); + _damage = Math.min(_damage + value, Long.MAX_VALUE); } @Override diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Attackable.java index ad211967e8..13808462d2 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -757,7 +757,7 @@ public class Attackable extends Npc return null; } - int damage = 0; + long damage = 0; Creature damageDealer = null; for (AggroInfo info : _aggroList.values()) { @@ -825,7 +825,7 @@ public class Attackable extends Npc * @param damage The number of damages given by the attacker Creature * @param aggroValue The hate (=damage) given by the attacker Creature */ - public void addDamageHate(Creature creature, int damage, int aggroValue) + public void addDamageHate(Creature creature, long damage, long aggroValue) { Creature attacker = creature; if ((attacker == null) || (attacker == this)) @@ -854,7 +854,7 @@ public class Attackable extends Npc // traps does not cause aggro // making this hack because not possible to determine if damage made by trap // so just check for triggered trap here - int aggro = aggroValue; + long aggro = aggroValue; if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) { ai.addHate(aggro); @@ -889,7 +889,7 @@ public class Attackable extends Npc } } - public void reduceHate(Creature target, int amount) + public void reduceHate(Creature target, long amount) { if (target == null) // whole aggrolist { @@ -966,7 +966,7 @@ public class Attackable extends Npc } Creature mostHated = null; - int maxHate = 0; + long maxHate = 0; // While Interacting over This Map Removing Object is Not Allowed // Go through the aggroList of the Attackable @@ -999,7 +999,7 @@ public class Attackable extends Npc Creature mostHated = null; Creature secondMostHated = null; - int maxHate = 0; + long maxHate = 0; final List result = new ArrayList<>(); // While iterating over this map removing objects is not allowed @@ -1049,7 +1049,7 @@ public class Attackable extends Npc * @param target The Creature whose hate level must be returned * @return the hate level of the Attackable against this Creature contained in _aggroList. */ - public int getHating(Creature target) + public long getHating(Creature target) { if (_aggroList.isEmpty() || (target == null)) { diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java index a80e0d4165..da59b2215d 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/Defender.java @@ -199,7 +199,7 @@ public class Defender extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java index 77c16245b1..bb2bb47113 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/FortCommander.java @@ -59,7 +59,7 @@ public class FortCommander extends Defender } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (attacker == null) { diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java index ce33cdad31..fcc42a1e6e 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/instance/FriendlyNpc.java @@ -79,7 +79,7 @@ public class FriendlyNpc extends Attackable } @Override - public void addDamageHate(Creature attacker, int damage, int aggro) + public void addDamageHate(Creature attacker, long damage, long aggro) { if (!attacker.isPlayable() && !(attacker instanceof FriendlyNpc)) {