From a557eafe5d889e39ee634b8e3b96e53c4db32d1c Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 7 Jun 2018 20:20:38 +0000 Subject: [PATCH] Changed calculateExpAndSp damage parameter to long. Thanks Sahar. --- .../scripts/ai/bosses/Istina/IstinaCavern.java | 4 ++-- .../gameserver/model/DamageDoneInfo.java | 6 +++--- .../com/l2jmobius/gameserver/model/L2Party.java | 2 +- .../gameserver/model/actor/L2Attackable.java | 10 +++++----- .../scripts/ai/bosses/Istina/IstinaCavern.java | 4 ++-- .../gameserver/model/DamageDoneInfo.java | 6 +++--- .../com/l2jmobius/gameserver/model/L2Party.java | 2 +- .../gameserver/model/actor/L2Attackable.java | 10 +++++----- .../scripts/ai/bosses/Istina/IstinaCavern.java | 4 ++-- .../gameserver/model/DamageDoneInfo.java | 6 +++--- .../com/l2jmobius/gameserver/model/L2Party.java | 2 +- .../gameserver/model/actor/L2Attackable.java | 10 +++++----- .../scripts/ai/bosses/Istina/IstinaCavern.java | 4 ++-- .../gameserver/model/DamageDoneInfo.java | 6 +++--- .../com/l2jmobius/gameserver/model/L2Party.java | 2 +- .../gameserver/model/actor/L2Attackable.java | 10 +++++----- .../gameserver/model/actor/L2Attackable.java | 17 ++++++++--------- .../gameserver/model/DamageDoneInfo.java | 6 +++--- .../com/l2jmobius/gameserver/model/L2Party.java | 2 +- .../gameserver/model/actor/L2Attackable.java | 12 ++++++------ .../actor/instance/L2GrandBossInstance.java | 2 +- .../actor/instance/L2RaidBossInstance.java | 2 +- .../gameserver/model/DamageDoneInfo.java | 6 +++--- .../com/l2jmobius/gameserver/model/L2Party.java | 2 +- .../gameserver/model/actor/L2Attackable.java | 10 +++++----- .../gameserver/model/DamageDoneInfo.java | 6 +++--- .../com/l2jmobius/gameserver/model/L2Party.java | 2 +- .../gameserver/model/actor/L2Attackable.java | 10 +++++----- .../gameserver/model/DamageDoneInfo.java | 6 +++--- .../com/l2jmobius/gameserver/model/L2Party.java | 2 +- .../gameserver/model/actor/L2Attackable.java | 10 +++++----- 31 files changed, 91 insertions(+), 92 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 318f800701..12026f688a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -657,7 +657,7 @@ public final class IstinaCavern extends AbstractInstance final Map rewards = new ConcurrentHashMap<>(); final StatsSet npcVars = npc.getVariables(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; int totalDamage = 0; for (AggroInfo info : ((L2Attackable) npc).getAggroList().values()) @@ -670,7 +670,7 @@ public final class IstinaCavern extends AbstractInstance final L2PcInstance attacker = info.getAttacker().getActingPlayer(); if (attacker != null) { - final int damage = info.getDamage(); + final long damage = info.getDamage(); if (damage > 1) { if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true)) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java index 047d3d7074..eda74d1b5f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public final class DamageDoneInfo { private final L2PcInstance _attacker; - private int _damage = 0; + private long _damage = 0; public DamageDoneInfo(L2PcInstance attacker) { @@ -36,12 +36,12 @@ public final class DamageDoneInfo return _attacker; } - public void addDamage(int damage) + public void addDamage(long damage) { _damage += damage; } - public int getDamage() + public long getDamage() { return _damage; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java index 38044ee767..9636853228 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java @@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup * @param partyDmg * @param target */ - public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, int partyDmg, L2Attackable target) + public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, long partyDmg, L2Attackable target) { final List validMembers = getValidMembers(rewardedMembers, topLvl); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 242d15899d..992034e9a3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -352,7 +352,7 @@ public class L2Attackable extends L2Npc final Map rewards = new ConcurrentHashMap<>(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; long totalDamage = 0; // While Iterating over This Map Removing Object is Not Allowed // Go through the _aggroList of the L2Attackable @@ -363,7 +363,7 @@ public class L2Attackable extends L2Npc if (attacker != null) { // Get damages done by this attacker - final int damage = info.getDamage(); + final long damage = info.getDamage(); // Prevent unwanted behavior if (damage > 1) @@ -454,7 +454,7 @@ public class L2Attackable extends L2Npc final L2PcInstance attacker = reward.getAttacker(); // Total amount of damage done - final int damage = reward.getDamage(); + final long damage = reward.getDamage(); // Get party final L2Party attackerParty = attacker.getParty(); @@ -528,7 +528,7 @@ public class L2Attackable extends L2Npc else { // share with party members - int partyDmg = 0; + long partyDmg = 0; double partyMul = 1; int partyLvl = 0; @@ -1361,7 +1361,7 @@ public class L2Attackable extends L2Npc * @param totalDamage The total damage done * @return */ - private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) + private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage) { final int levelDiff = charLevel - getLevel(); double xp = 0; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 318f800701..12026f688a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -657,7 +657,7 @@ public final class IstinaCavern extends AbstractInstance final Map rewards = new ConcurrentHashMap<>(); final StatsSet npcVars = npc.getVariables(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; int totalDamage = 0; for (AggroInfo info : ((L2Attackable) npc).getAggroList().values()) @@ -670,7 +670,7 @@ public final class IstinaCavern extends AbstractInstance final L2PcInstance attacker = info.getAttacker().getActingPlayer(); if (attacker != null) { - final int damage = info.getDamage(); + final long damage = info.getDamage(); if (damage > 1) { if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true)) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java index 047d3d7074..eda74d1b5f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public final class DamageDoneInfo { private final L2PcInstance _attacker; - private int _damage = 0; + private long _damage = 0; public DamageDoneInfo(L2PcInstance attacker) { @@ -36,12 +36,12 @@ public final class DamageDoneInfo return _attacker; } - public void addDamage(int damage) + public void addDamage(long damage) { _damage += damage; } - public int getDamage() + public long getDamage() { return _damage; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java index 38044ee767..9636853228 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java @@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup * @param partyDmg * @param target */ - public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, int partyDmg, L2Attackable target) + public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, long partyDmg, L2Attackable target) { final List validMembers = getValidMembers(rewardedMembers, topLvl); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 6011451050..5a9fc58f63 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc final Map rewards = new ConcurrentHashMap<>(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; long totalDamage = 0; // While Iterating over This Map Removing Object is Not Allowed // Go through the _aggroList of the L2Attackable @@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc if (attacker != null) { // Get damages done by this attacker - final int damage = info.getDamage(); + final long damage = info.getDamage(); // Prevent unwanted behavior if (damage > 1) @@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc final L2PcInstance attacker = reward.getAttacker(); // Total amount of damage done - final int damage = reward.getDamage(); + final long damage = reward.getDamage(); // Get party final L2Party attackerParty = attacker.getParty(); @@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc else { // share with party members - int partyDmg = 0; + long partyDmg = 0; double partyMul = 1; int partyLvl = 0; @@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc * @param totalDamage The total damage done * @return */ - private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) + private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage) { final int levelDiff = charLevel - getLevel(); double xp = 0; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 318f800701..12026f688a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -657,7 +657,7 @@ public final class IstinaCavern extends AbstractInstance final Map rewards = new ConcurrentHashMap<>(); final StatsSet npcVars = npc.getVariables(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; int totalDamage = 0; for (AggroInfo info : ((L2Attackable) npc).getAggroList().values()) @@ -670,7 +670,7 @@ public final class IstinaCavern extends AbstractInstance final L2PcInstance attacker = info.getAttacker().getActingPlayer(); if (attacker != null) { - final int damage = info.getDamage(); + final long damage = info.getDamage(); if (damage > 1) { if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true)) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java index 047d3d7074..eda74d1b5f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public final class DamageDoneInfo { private final L2PcInstance _attacker; - private int _damage = 0; + private long _damage = 0; public DamageDoneInfo(L2PcInstance attacker) { @@ -36,12 +36,12 @@ public final class DamageDoneInfo return _attacker; } - public void addDamage(int damage) + public void addDamage(long damage) { _damage += damage; } - public int getDamage() + public long getDamage() { return _damage; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java index 38044ee767..9636853228 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java @@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup * @param partyDmg * @param target */ - public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, int partyDmg, L2Attackable target) + public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, long partyDmg, L2Attackable target) { final List validMembers = getValidMembers(rewardedMembers, topLvl); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 6011451050..5a9fc58f63 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc final Map rewards = new ConcurrentHashMap<>(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; long totalDamage = 0; // While Iterating over This Map Removing Object is Not Allowed // Go through the _aggroList of the L2Attackable @@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc if (attacker != null) { // Get damages done by this attacker - final int damage = info.getDamage(); + final long damage = info.getDamage(); // Prevent unwanted behavior if (damage > 1) @@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc final L2PcInstance attacker = reward.getAttacker(); // Total amount of damage done - final int damage = reward.getDamage(); + final long damage = reward.getDamage(); // Get party final L2Party attackerParty = attacker.getParty(); @@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc else { // share with party members - int partyDmg = 0; + long partyDmg = 0; double partyMul = 1; int partyLvl = 0; @@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc * @param totalDamage The total damage done * @return */ - private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) + private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage) { final int levelDiff = charLevel - getLevel(); double xp = 0; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java index 318f800701..12026f688a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java @@ -657,7 +657,7 @@ public final class IstinaCavern extends AbstractInstance final Map rewards = new ConcurrentHashMap<>(); final StatsSet npcVars = npc.getVariables(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; int totalDamage = 0; for (AggroInfo info : ((L2Attackable) npc).getAggroList().values()) @@ -670,7 +670,7 @@ public final class IstinaCavern extends AbstractInstance final L2PcInstance attacker = info.getAttacker().getActingPlayer(); if (attacker != null) { - final int damage = info.getDamage(); + final long damage = info.getDamage(); if (damage > 1) { if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true)) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java index 047d3d7074..eda74d1b5f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public final class DamageDoneInfo { private final L2PcInstance _attacker; - private int _damage = 0; + private long _damage = 0; public DamageDoneInfo(L2PcInstance attacker) { @@ -36,12 +36,12 @@ public final class DamageDoneInfo return _attacker; } - public void addDamage(int damage) + public void addDamage(long damage) { _damage += damage; } - public int getDamage() + public long getDamage() { return _damage; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java index 38044ee767..9636853228 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java @@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup * @param partyDmg * @param target */ - public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, int partyDmg, L2Attackable target) + public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, long partyDmg, L2Attackable target) { final List validMembers = getValidMembers(rewardedMembers, topLvl); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 6011451050..5a9fc58f63 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc final Map rewards = new ConcurrentHashMap<>(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; long totalDamage = 0; // While Iterating over This Map Removing Object is Not Allowed // Go through the _aggroList of the L2Attackable @@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc if (attacker != null) { // Get damages done by this attacker - final int damage = info.getDamage(); + final long damage = info.getDamage(); // Prevent unwanted behavior if (damage > 1) @@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc final L2PcInstance attacker = reward.getAttacker(); // Total amount of damage done - final int damage = reward.getDamage(); + final long damage = reward.getDamage(); // Get party final L2Party attackerParty = attacker.getParty(); @@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc else { // share with party members - int partyDmg = 0; + long partyDmg = 0; double partyMul = 1; int partyLvl = 0; @@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc * @param totalDamage The total damage done * @return */ - private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) + private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage) { final int levelDiff = charLevel - getLevel(); double xp = 0; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 373468279c..4ce7631376 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -157,15 +157,15 @@ public class L2Attackable extends L2NpcInstance protected final class RewardInfo { protected L2Character _attacker; - protected int _dmg = 0; + protected long _dmg = 0; - public RewardInfo(L2Character pAttacker, int pDmg) + public RewardInfo(L2Character pAttacker, long pDmg) { _attacker = pAttacker; _dmg = pDmg; } - public void addDamage(int pDmg) + public void addDamage(long pDmg) { _dmg += pDmg; } @@ -656,9 +656,9 @@ public class L2Attackable extends L2NpcInstance } L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; - int damage; + long damage; L2Character attacker, ddealer; @@ -715,7 +715,6 @@ public class L2Attackable extends L2NpcInstance maxDealer = ((L2Playable) ddealer).getActingPlayer(); maxDamage = reward._dmg; } - } } } @@ -734,8 +733,8 @@ public class L2Attackable extends L2NpcInstance if (!rewards.isEmpty()) { L2Party attackerParty; - long exp; - int levelDiff, partyDmg, partyLvl, sp; + long exp, partyDmg; + int levelDiff, partyLvl, sp; float partyMul, penalty; RewardInfo reward2; int[] tmp; @@ -3092,7 +3091,7 @@ public class L2Attackable extends L2NpcInstance * @param damage The damages given by the attacker (L2PcInstance, L2SummonInstance or L2Party) * @return */ - private int[] calculateExpAndSp(int diff, int damage) + private int[] calculateExpAndSp(int diff, long damage) { double xp; double sp; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java index 08c5e93c9e..27b777cfea 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public final class DamageDoneInfo { private final L2PcInstance _attacker; - private int _damage = 0; + private long _damage = 0; public DamageDoneInfo(L2PcInstance attacker) { @@ -36,12 +36,12 @@ public final class DamageDoneInfo return _attacker; } - public void addDamage(int damage) + public void addDamage(long damage) { _damage += damage; } - public int getDamage() + public long getDamage() { return _damage; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java index 92ef7f19ba..5aef8ac62a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java @@ -746,7 +746,7 @@ public class L2Party extends AbstractPlayerGroup * @param partyDmg * @param target */ - public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, int partyDmg, L2Attackable target) + public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, long partyDmg, L2Attackable target) { final List validMembers = getValidMembers(rewardedMembers, topLvl); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index b379851c47..ada542e319 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -363,7 +363,7 @@ public class L2Attackable extends L2Npc final Map rewards = new ConcurrentHashMap<>(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; long totalDamage = 0; // While Iterating over This Map Removing Object is Not Allowed // Go through the _aggroList of the L2Attackable @@ -379,7 +379,7 @@ public class L2Attackable extends L2Npc if (attacker != null) { // Get damages done by this attacker - final int damage = info.getDamage(); + final long damage = info.getDamage(); // Prevent unwanted behavior if (damage > 1) @@ -429,7 +429,7 @@ public class L2Attackable extends L2Npc final L2PcInstance attacker = reward.getAttacker(); // Total amount of damage done - final int damage = reward.getDamage(); + final long damage = reward.getDamage(); // Get party final L2Party attackerParty = attacker.getParty(); @@ -485,7 +485,7 @@ public class L2Attackable extends L2Npc else { // share with party members - int partyDmg = 0; + long partyDmg = 0; double partyMul = 1; int partyLvl = 0; @@ -1328,7 +1328,7 @@ public class L2Attackable extends L2Npc * @param totalDamage The total damage done * @return */ - private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) + private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage) { final int levelDiff = charLevel - getLevel(); double xp = 0; @@ -1672,7 +1672,7 @@ public class L2Attackable extends L2Npc /* * Return vitality points decrease (if positive) or increase (if negative) based on damage. Maximum for damage = maxHp. */ - public float getVitalityPoints(int damage) + public float getVitalityPoints(long damage) { // sanity check if (damage <= 0) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java index a108d697ad..4a26b6697f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java @@ -105,7 +105,7 @@ public final class L2GrandBossInstance extends L2MonsterInstance } @Override - public float getVitalityPoints(int damage) + public float getVitalityPoints(long damage) { return -super.getVitalityPoints(damage) / 100; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java index 0cb35fbbf7..55d6a2dd04 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java @@ -148,7 +148,7 @@ public class L2RaidBossInstance extends L2MonsterInstance } @Override - public float getVitalityPoints(int damage) + public float getVitalityPoints(long damage) { return -super.getVitalityPoints(damage) / 100; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java index 047d3d7074..eda74d1b5f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public final class DamageDoneInfo { private final L2PcInstance _attacker; - private int _damage = 0; + private long _damage = 0; public DamageDoneInfo(L2PcInstance attacker) { @@ -36,12 +36,12 @@ public final class DamageDoneInfo return _attacker; } - public void addDamage(int damage) + public void addDamage(long damage) { _damage += damage; } - public int getDamage() + public long getDamage() { return _damage; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java index 38044ee767..9636853228 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java @@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup * @param partyDmg * @param target */ - public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, int partyDmg, L2Attackable target) + public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, long partyDmg, L2Attackable target) { final List validMembers = getValidMembers(rewardedMembers, topLvl); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 7177ba1a8b..0acc52a711 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc final Map rewards = new ConcurrentHashMap<>(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; long totalDamage = 0; // While Iterating over This Map Removing Object is Not Allowed // Go through the _aggroList of the L2Attackable @@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc if (attacker != null) { // Get damages done by this attacker - final int damage = info.getDamage(); + final long damage = info.getDamage(); // Prevent unwanted behavior if (damage > 1) @@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc final L2PcInstance attacker = reward.getAttacker(); // Total amount of damage done - final int damage = reward.getDamage(); + final long damage = reward.getDamage(); // Get party final L2Party attackerParty = attacker.getParty(); @@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc else { // share with party members - int partyDmg = 0; + long partyDmg = 0; double partyMul = 1; int partyLvl = 0; @@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc * @param totalDamage The total damage done * @return */ - private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) + private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage) { final int levelDiff = charLevel - getLevel(); double xp = 0; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java index 047d3d7074..eda74d1b5f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public final class DamageDoneInfo { private final L2PcInstance _attacker; - private int _damage = 0; + private long _damage = 0; public DamageDoneInfo(L2PcInstance attacker) { @@ -36,12 +36,12 @@ public final class DamageDoneInfo return _attacker; } - public void addDamage(int damage) + public void addDamage(long damage) { _damage += damage; } - public int getDamage() + public long getDamage() { return _damage; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java index 38044ee767..9636853228 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java @@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup * @param partyDmg * @param target */ - public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, int partyDmg, L2Attackable target) + public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, long partyDmg, L2Attackable target) { final List validMembers = getValidMembers(rewardedMembers, topLvl); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 7177ba1a8b..0acc52a711 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc final Map rewards = new ConcurrentHashMap<>(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; long totalDamage = 0; // While Iterating over This Map Removing Object is Not Allowed // Go through the _aggroList of the L2Attackable @@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc if (attacker != null) { // Get damages done by this attacker - final int damage = info.getDamage(); + final long damage = info.getDamage(); // Prevent unwanted behavior if (damage > 1) @@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc final L2PcInstance attacker = reward.getAttacker(); // Total amount of damage done - final int damage = reward.getDamage(); + final long damage = reward.getDamage(); // Get party final L2Party attackerParty = attacker.getParty(); @@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc else { // share with party members - int partyDmg = 0; + long partyDmg = 0; double partyMul = 1; int partyLvl = 0; @@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc * @param totalDamage The total damage done * @return */ - private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) + private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage) { final int levelDiff = charLevel - getLevel(); double xp = 0; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java index 047d3d7074..eda74d1b5f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public final class DamageDoneInfo { private final L2PcInstance _attacker; - private int _damage = 0; + private long _damage = 0; public DamageDoneInfo(L2PcInstance attacker) { @@ -36,12 +36,12 @@ public final class DamageDoneInfo return _attacker; } - public void addDamage(int damage) + public void addDamage(long damage) { _damage += damage; } - public int getDamage() + public long getDamage() { return _damage; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Party.java index 38044ee767..9636853228 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Party.java @@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup * @param partyDmg * @param target */ - public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, int partyDmg, L2Attackable target) + public void distributeXpAndSp(double xpReward, double spReward, List rewardedMembers, int topLvl, long partyDmg, L2Attackable target) { final List validMembers = getValidMembers(rewardedMembers, topLvl); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 7177ba1a8b..0acc52a711 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc final Map rewards = new ConcurrentHashMap<>(); L2PcInstance maxDealer = null; - int maxDamage = 0; + long maxDamage = 0; long totalDamage = 0; // While Iterating over This Map Removing Object is Not Allowed // Go through the _aggroList of the L2Attackable @@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc if (attacker != null) { // Get damages done by this attacker - final int damage = info.getDamage(); + final long damage = info.getDamage(); // Prevent unwanted behavior if (damage > 1) @@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc final L2PcInstance attacker = reward.getAttacker(); // Total amount of damage done - final int damage = reward.getDamage(); + final long damage = reward.getDamage(); // Get party final L2Party attackerParty = attacker.getParty(); @@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc else { // share with party members - int partyDmg = 0; + long partyDmg = 0; double partyMul = 1; int partyLvl = 0; @@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc * @param totalDamage The total damage done * @return */ - private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) + private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage) { final int levelDiff = charLevel - getLevel(); double xp = 0;