lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed calculateExpAndSp damage parameter to long.

Browse Source 
Thanks Sahar.
This commit is contained in:
MobiusDev 2018-06-07 20:20:38 +00:00
parent 04160e3878
commit a557eafe5d
31 changed files with 91 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java vendored
View File

@ -657,7 +657,7 @@ public final class IstinaCavern extends AbstractInstance
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
final StatsSet npcVars = npc.getVariables(); final StatsSet npcVars = npc.getVariables();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
int totalDamage = 0; int totalDamage = 0;
for (AggroInfo info : ((L2Attackable) npc).getAggroList().values()) for (AggroInfo info : ((L2Attackable) npc).getAggroList().values())
@ -670,7 +670,7 @@ public final class IstinaCavern extends AbstractInstance
final L2PcInstance attacker = info.getAttacker().getActingPlayer(); final L2PcInstance attacker = info.getAttacker().getActingPlayer();
if (attacker != null) if (attacker != null)
{ {
final int damage = info.getDamage(); final long damage = info.getDamage();
if (damage > 1) if (damage > 1)
{ {
if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true)) if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true))

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java
View File

@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public final class DamageDoneInfo public final class DamageDoneInfo
{ {
private final L2PcInstance _attacker; private final L2PcInstance _attacker;
private int _damage = 0; private long _damage = 0;
public DamageDoneInfo(L2PcInstance attacker) public DamageDoneInfo(L2PcInstance attacker)
{ {
@ -36,12 +36,12 @@ public final class DamageDoneInfo
return _attacker; return _attacker;
} }
public void addDamage(int damage) public void addDamage(long damage)
{ {
_damage += damage; _damage += damage;
} }
public int getDamage() public long getDamage()
{ {
return _damage; return _damage;
} }

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup
* @param partyDmg * @param partyDmg
* @param target * @param target
*/ */
public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, int partyDmg, L2Attackable target) public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, long partyDmg, L2Attackable target)
{ {
final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl); final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl);

10
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@ -352,7 +352,7 @@ public class L2Attackable extends L2Npc
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
long totalDamage = 0; long totalDamage = 0;
// While Iterating over This Map Removing Object is Not Allowed // While Iterating over This Map Removing Object is Not Allowed
// Go through the _aggroList of the L2Attackable // Go through the _aggroList of the L2Attackable
@ -363,7 +363,7 @@ public class L2Attackable extends L2Npc
if (attacker != null) if (attacker != null)
{ {
// Get damages done by this attacker // Get damages done by this attacker
final int damage = info.getDamage(); final long damage = info.getDamage();
// Prevent unwanted behavior // Prevent unwanted behavior
if (damage > 1) if (damage > 1)
@ -454,7 +454,7 @@ public class L2Attackable extends L2Npc
final L2PcInstance attacker = reward.getAttacker(); final L2PcInstance attacker = reward.getAttacker();
// Total amount of damage done // Total amount of damage done
final int damage = reward.getDamage(); final long damage = reward.getDamage();
// Get party // Get party
final L2Party attackerParty = attacker.getParty(); final L2Party attackerParty = attacker.getParty();
@ -528,7 +528,7 @@ public class L2Attackable extends L2Npc
else else
{ {
// share with party members // share with party members
int partyDmg = 0; long partyDmg = 0;
double partyMul = 1; double partyMul = 1;
int partyLvl = 0; int partyLvl = 0;
@ -1361,7 +1361,7 @@ public class L2Attackable extends L2Npc
* @param totalDamage The total damage done * @param totalDamage The total damage done
* @return * @return
*/ */
private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage)
{ {
final int levelDiff = charLevel - getLevel(); final int levelDiff = charLevel - getLevel();
double xp = 0; double xp = 0;

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java vendored
View File

@ -657,7 +657,7 @@ public final class IstinaCavern extends AbstractInstance
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
final StatsSet npcVars = npc.getVariables(); final StatsSet npcVars = npc.getVariables();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
int totalDamage = 0; int totalDamage = 0;
for (AggroInfo info : ((L2Attackable) npc).getAggroList().values()) for (AggroInfo info : ((L2Attackable) npc).getAggroList().values())
@ -670,7 +670,7 @@ public final class IstinaCavern extends AbstractInstance
final L2PcInstance attacker = info.getAttacker().getActingPlayer(); final L2PcInstance attacker = info.getAttacker().getActingPlayer();
if (attacker != null) if (attacker != null)
{ {
final int damage = info.getDamage(); final long damage = info.getDamage();
if (damage > 1) if (damage > 1)
{ {
if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true)) if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true))

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java
View File

@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public final class DamageDoneInfo public final class DamageDoneInfo
{ {
private final L2PcInstance _attacker; private final L2PcInstance _attacker;
private int _damage = 0; private long _damage = 0;
public DamageDoneInfo(L2PcInstance attacker) public DamageDoneInfo(L2PcInstance attacker)
{ {
@ -36,12 +36,12 @@ public final class DamageDoneInfo
return _attacker; return _attacker;
} }
public void addDamage(int damage) public void addDamage(long damage)
{ {
_damage += damage; _damage += damage;
} }
public int getDamage() public long getDamage()
{ {
return _damage; return _damage;
} }

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup
* @param partyDmg * @param partyDmg
* @param target * @param target
*/ */
public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, int partyDmg, L2Attackable target) public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, long partyDmg, L2Attackable target)
{ {
final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl); final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl);

10
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
long totalDamage = 0; long totalDamage = 0;
// While Iterating over This Map Removing Object is Not Allowed // While Iterating over This Map Removing Object is Not Allowed
// Go through the _aggroList of the L2Attackable // Go through the _aggroList of the L2Attackable
@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc
if (attacker != null) if (attacker != null)
{ {
// Get damages done by this attacker // Get damages done by this attacker
final int damage = info.getDamage(); final long damage = info.getDamage();
// Prevent unwanted behavior // Prevent unwanted behavior
if (damage > 1) if (damage > 1)
@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc
final L2PcInstance attacker = reward.getAttacker(); final L2PcInstance attacker = reward.getAttacker();
// Total amount of damage done // Total amount of damage done
final int damage = reward.getDamage(); final long damage = reward.getDamage();
// Get party // Get party
final L2Party attackerParty = attacker.getParty(); final L2Party attackerParty = attacker.getParty();
@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc
else else
{ {
// share with party members // share with party members
int partyDmg = 0; long partyDmg = 0;
double partyMul = 1; double partyMul = 1;
int partyLvl = 0; int partyLvl = 0;
@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc
* @param totalDamage The total damage done * @param totalDamage The total damage done
* @return * @return
*/ */
private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage)
{ {
final int levelDiff = charLevel - getLevel(); final int levelDiff = charLevel - getLevel();
double xp = 0; double xp = 0;

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java vendored
View File

@ -657,7 +657,7 @@ public final class IstinaCavern extends AbstractInstance
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
final StatsSet npcVars = npc.getVariables(); final StatsSet npcVars = npc.getVariables();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
int totalDamage = 0; int totalDamage = 0;
for (AggroInfo info : ((L2Attackable) npc).getAggroList().values()) for (AggroInfo info : ((L2Attackable) npc).getAggroList().values())
@ -670,7 +670,7 @@ public final class IstinaCavern extends AbstractInstance
final L2PcInstance attacker = info.getAttacker().getActingPlayer(); final L2PcInstance attacker = info.getAttacker().getActingPlayer();
if (attacker != null) if (attacker != null)
{ {
final int damage = info.getDamage(); final long damage = info.getDamage();
if (damage > 1) if (damage > 1)
{ {
if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true)) if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true))

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java
View File

@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public final class DamageDoneInfo public final class DamageDoneInfo
{ {
private final L2PcInstance _attacker; private final L2PcInstance _attacker;
private int _damage = 0; private long _damage = 0;
public DamageDoneInfo(L2PcInstance attacker) public DamageDoneInfo(L2PcInstance attacker)
{ {
@ -36,12 +36,12 @@ public final class DamageDoneInfo
return _attacker; return _attacker;
} }
public void addDamage(int damage) public void addDamage(long damage)
{ {
_damage += damage; _damage += damage;
} }
public int getDamage() public long getDamage()
{ {
return _damage; return _damage;
} }

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup
* @param partyDmg * @param partyDmg
* @param target * @param target
*/ */
public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, int partyDmg, L2Attackable target) public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, long partyDmg, L2Attackable target)
{ {
final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl); final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl);

10
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
long totalDamage = 0; long totalDamage = 0;
// While Iterating over This Map Removing Object is Not Allowed // While Iterating over This Map Removing Object is Not Allowed
// Go through the _aggroList of the L2Attackable // Go through the _aggroList of the L2Attackable
@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc
if (attacker != null) if (attacker != null)
{ {
// Get damages done by this attacker // Get damages done by this attacker
final int damage = info.getDamage(); final long damage = info.getDamage();
// Prevent unwanted behavior // Prevent unwanted behavior
if (damage > 1) if (damage > 1)
@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc
final L2PcInstance attacker = reward.getAttacker(); final L2PcInstance attacker = reward.getAttacker();
// Total amount of damage done // Total amount of damage done
final int damage = reward.getDamage(); final long damage = reward.getDamage();
// Get party // Get party
final L2Party attackerParty = attacker.getParty(); final L2Party attackerParty = attacker.getParty();
@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc
else else
{ {
// share with party members // share with party members
int partyDmg = 0; long partyDmg = 0;
double partyMul = 1; double partyMul = 1;
int partyLvl = 0; int partyLvl = 0;
@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc
* @param totalDamage The total damage done * @param totalDamage The total damage done
* @return * @return
*/ */
private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage)
{ {
final int levelDiff = charLevel - getLevel(); final int levelDiff = charLevel - getLevel();
double xp = 0; double xp = 0;

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Istina/IstinaCavern.java vendored
View File

@ -657,7 +657,7 @@ public final class IstinaCavern extends AbstractInstance
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
final StatsSet npcVars = npc.getVariables(); final StatsSet npcVars = npc.getVariables();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
int totalDamage = 0; int totalDamage = 0;
for (AggroInfo info : ((L2Attackable) npc).getAggroList().values()) for (AggroInfo info : ((L2Attackable) npc).getAggroList().values())
@ -670,7 +670,7 @@ public final class IstinaCavern extends AbstractInstance
final L2PcInstance attacker = info.getAttacker().getActingPlayer(); final L2PcInstance attacker = info.getAttacker().getActingPlayer();
if (attacker != null) if (attacker != null)
{ {
final int damage = info.getDamage(); final long damage = info.getDamage();
if (damage > 1) if (damage > 1)
{ {
if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true)) if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true))

6
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java
View File

@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public final class DamageDoneInfo public final class DamageDoneInfo
{ {
private final L2PcInstance _attacker; private final L2PcInstance _attacker;
private int _damage = 0; private long _damage = 0;
public DamageDoneInfo(L2PcInstance attacker) public DamageDoneInfo(L2PcInstance attacker)
{ {
@ -36,12 +36,12 @@ public final class DamageDoneInfo
return _attacker; return _attacker;
} }
public void addDamage(int damage) public void addDamage(long damage)
{ {
_damage += damage; _damage += damage;
} }
public int getDamage() public long getDamage()
{ {
return _damage; return _damage;
} }

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup
* @param partyDmg * @param partyDmg
* @param target * @param target
*/ */
public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, int partyDmg, L2Attackable target) public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, long partyDmg, L2Attackable target)
{ {
final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl); final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl);

10
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
long totalDamage = 0; long totalDamage = 0;
// While Iterating over This Map Removing Object is Not Allowed // While Iterating over This Map Removing Object is Not Allowed
// Go through the _aggroList of the L2Attackable // Go through the _aggroList of the L2Attackable
@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc
if (attacker != null) if (attacker != null)
{ {
// Get damages done by this attacker // Get damages done by this attacker
final int damage = info.getDamage(); final long damage = info.getDamage();
// Prevent unwanted behavior // Prevent unwanted behavior
if (damage > 1) if (damage > 1)
@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc
final L2PcInstance attacker = reward.getAttacker(); final L2PcInstance attacker = reward.getAttacker();
// Total amount of damage done // Total amount of damage done
final int damage = reward.getDamage(); final long damage = reward.getDamage();
// Get party // Get party
final L2Party attackerParty = attacker.getParty(); final L2Party attackerParty = attacker.getParty();
@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc
else else
{ {
// share with party members // share with party members
int partyDmg = 0; long partyDmg = 0;
double partyMul = 1; double partyMul = 1;
int partyLvl = 0; int partyLvl = 0;
@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc
* @param totalDamage The total damage done * @param totalDamage The total damage done
* @return * @return
*/ */
private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage)
{ {
final int levelDiff = charLevel - getLevel(); final int levelDiff = charLevel - getLevel();
double xp = 0; double xp = 0;

17
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@ -157,15 +157,15 @@ public class L2Attackable extends L2NpcInstance
protected final class RewardInfo protected final class RewardInfo
{ {
protected L2Character _attacker; 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; _attacker = pAttacker;
_dmg = pDmg; _dmg = pDmg;
} }
public void addDamage(int pDmg) public void addDamage(long pDmg)
{ {
_dmg += pDmg; _dmg += pDmg;
} }
@ -656,9 +656,9 @@ public class L2Attackable extends L2NpcInstance
} }
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
int damage; long damage;
L2Character attacker, ddealer; L2Character attacker, ddealer;
@ -715,7 +715,6 @@ public class L2Attackable extends L2NpcInstance
maxDealer = ((L2Playable) ddealer).getActingPlayer(); maxDealer = ((L2Playable) ddealer).getActingPlayer();
maxDamage = reward._dmg; maxDamage = reward._dmg;
} }
} }
} }
} }
@ -734,8 +733,8 @@ public class L2Attackable extends L2NpcInstance
if (!rewards.isEmpty()) if (!rewards.isEmpty())
{ {
L2Party attackerParty; L2Party attackerParty;
long exp; long exp, partyDmg;
int levelDiff, partyDmg, partyLvl, sp; int levelDiff, partyLvl, sp;
float partyMul, penalty; float partyMul, penalty;
RewardInfo reward2; RewardInfo reward2;
int[] tmp; int[] tmp;
@ -3092,7 +3091,7 @@ public class L2Attackable extends L2NpcInstance
* @param damage The damages given by the attacker (L2PcInstance, L2SummonInstance or L2Party) * @param damage The damages given by the attacker (L2PcInstance, L2SummonInstance or L2Party)
* @return * @return
*/ */
private int[] calculateExpAndSp(int diff, int damage) private int[] calculateExpAndSp(int diff, long damage)
{ {
double xp; double xp;
double sp; double sp;

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java
View File

@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public final class DamageDoneInfo public final class DamageDoneInfo
{ {
private final L2PcInstance _attacker; private final L2PcInstance _attacker;
private int _damage = 0; private long _damage = 0;
public DamageDoneInfo(L2PcInstance attacker) public DamageDoneInfo(L2PcInstance attacker)
{ {
@ -36,12 +36,12 @@ public final class DamageDoneInfo
return _attacker; return _attacker;
} }
public void addDamage(int damage) public void addDamage(long damage)
{ {
_damage += damage; _damage += damage;
} }
public int getDamage() public long getDamage()
{ {
return _damage; return _damage;
} }

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -746,7 +746,7 @@ public class L2Party extends AbstractPlayerGroup
* @param partyDmg * @param partyDmg
* @param target * @param target
*/ */
public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, int partyDmg, L2Attackable target) public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, long partyDmg, L2Attackable target)
{ {
final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl); final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl);

12
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@ -363,7 +363,7 @@ public class L2Attackable extends L2Npc
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
long totalDamage = 0; long totalDamage = 0;
// While Iterating over This Map Removing Object is Not Allowed // While Iterating over This Map Removing Object is Not Allowed
// Go through the _aggroList of the L2Attackable // Go through the _aggroList of the L2Attackable
@ -379,7 +379,7 @@ public class L2Attackable extends L2Npc
if (attacker != null) if (attacker != null)
{ {
// Get damages done by this attacker // Get damages done by this attacker
final int damage = info.getDamage(); final long damage = info.getDamage();
// Prevent unwanted behavior // Prevent unwanted behavior
if (damage > 1) if (damage > 1)
@ -429,7 +429,7 @@ public class L2Attackable extends L2Npc
final L2PcInstance attacker = reward.getAttacker(); final L2PcInstance attacker = reward.getAttacker();
// Total amount of damage done // Total amount of damage done
final int damage = reward.getDamage(); final long damage = reward.getDamage();
// Get party // Get party
final L2Party attackerParty = attacker.getParty(); final L2Party attackerParty = attacker.getParty();
@ -485,7 +485,7 @@ public class L2Attackable extends L2Npc
else else
{ {
// share with party members // share with party members
int partyDmg = 0; long partyDmg = 0;
double partyMul = 1; double partyMul = 1;
int partyLvl = 0; int partyLvl = 0;
@ -1328,7 +1328,7 @@ public class L2Attackable extends L2Npc
* @param totalDamage The total damage done * @param totalDamage The total damage done
* @return * @return
*/ */
private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage)
{ {
final int levelDiff = charLevel - getLevel(); final int levelDiff = charLevel - getLevel();
double xp = 0; 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. * 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 // sanity check
if (damage <= 0) if (damage <= 0)

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java
View File

@ -105,7 +105,7 @@ public final class L2GrandBossInstance extends L2MonsterInstance
} }
@Override @Override
public float getVitalityPoints(int damage) public float getVitalityPoints(long damage)
{ {
return -super.getVitalityPoints(damage) / 100; return -super.getVitalityPoints(damage) / 100;
} }

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java
View File

@ -148,7 +148,7 @@ public class L2RaidBossInstance extends L2MonsterInstance
} }
@Override @Override
public float getVitalityPoints(int damage) public float getVitalityPoints(long damage)
{ {
return -super.getVitalityPoints(damage) / 100; return -super.getVitalityPoints(damage) / 100;
} }

6
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java
View File

@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public final class DamageDoneInfo public final class DamageDoneInfo
{ {
private final L2PcInstance _attacker; private final L2PcInstance _attacker;
private int _damage = 0; private long _damage = 0;
public DamageDoneInfo(L2PcInstance attacker) public DamageDoneInfo(L2PcInstance attacker)
{ {
@ -36,12 +36,12 @@ public final class DamageDoneInfo
return _attacker; return _attacker;
} }
public void addDamage(int damage) public void addDamage(long damage)
{ {
_damage += damage; _damage += damage;
} }
public int getDamage() public long getDamage()
{ {
return _damage; return _damage;
} }

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup
* @param partyDmg * @param partyDmg
* @param target * @param target
*/ */
public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, int partyDmg, L2Attackable target) public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, long partyDmg, L2Attackable target)
{ {
final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl); final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl);

10
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
long totalDamage = 0; long totalDamage = 0;
// While Iterating over This Map Removing Object is Not Allowed // While Iterating over This Map Removing Object is Not Allowed
// Go through the _aggroList of the L2Attackable // Go through the _aggroList of the L2Attackable
@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc
if (attacker != null) if (attacker != null)
{ {
// Get damages done by this attacker // Get damages done by this attacker
final int damage = info.getDamage(); final long damage = info.getDamage();
// Prevent unwanted behavior // Prevent unwanted behavior
if (damage > 1) if (damage > 1)
@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc
final L2PcInstance attacker = reward.getAttacker(); final L2PcInstance attacker = reward.getAttacker();
// Total amount of damage done // Total amount of damage done
final int damage = reward.getDamage(); final long damage = reward.getDamage();
// Get party // Get party
final L2Party attackerParty = attacker.getParty(); final L2Party attackerParty = attacker.getParty();
@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc
else else
{ {
// share with party members // share with party members
int partyDmg = 0; long partyDmg = 0;
double partyMul = 1; double partyMul = 1;
int partyLvl = 0; int partyLvl = 0;
@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc
* @param totalDamage The total damage done * @param totalDamage The total damage done
* @return * @return
*/ */
private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage)
{ {
final int levelDiff = charLevel - getLevel(); final int levelDiff = charLevel - getLevel();
double xp = 0; double xp = 0;

6
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java
View File

@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public final class DamageDoneInfo public final class DamageDoneInfo
{ {
private final L2PcInstance _attacker; private final L2PcInstance _attacker;
private int _damage = 0; private long _damage = 0;
public DamageDoneInfo(L2PcInstance attacker) public DamageDoneInfo(L2PcInstance attacker)
{ {
@ -36,12 +36,12 @@ public final class DamageDoneInfo
return _attacker; return _attacker;
} }
public void addDamage(int damage) public void addDamage(long damage)
{ {
_damage += damage; _damage += damage;
} }
public int getDamage() public long getDamage()
{ {
return _damage; return _damage;
} }

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup
* @param partyDmg * @param partyDmg
* @param target * @param target
*/ */
public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, int partyDmg, L2Attackable target) public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, long partyDmg, L2Attackable target)
{ {
final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl); final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl);

10
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
long totalDamage = 0; long totalDamage = 0;
// While Iterating over This Map Removing Object is Not Allowed // While Iterating over This Map Removing Object is Not Allowed
// Go through the _aggroList of the L2Attackable // Go through the _aggroList of the L2Attackable
@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc
if (attacker != null) if (attacker != null)
{ {
// Get damages done by this attacker // Get damages done by this attacker
final int damage = info.getDamage(); final long damage = info.getDamage();
// Prevent unwanted behavior // Prevent unwanted behavior
if (damage > 1) if (damage > 1)
@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc
final L2PcInstance attacker = reward.getAttacker(); final L2PcInstance attacker = reward.getAttacker();
// Total amount of damage done // Total amount of damage done
final int damage = reward.getDamage(); final long damage = reward.getDamage();
// Get party // Get party
final L2Party attackerParty = attacker.getParty(); final L2Party attackerParty = attacker.getParty();
@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc
else else
{ {
// share with party members // share with party members
int partyDmg = 0; long partyDmg = 0;
double partyMul = 1; double partyMul = 1;
int partyLvl = 0; int partyLvl = 0;
@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc
* @param totalDamage The total damage done * @param totalDamage The total damage done
* @return * @return
*/ */
private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage)
{ {
final int levelDiff = charLevel - getLevel(); final int levelDiff = charLevel - getLevel();
double xp = 0; double xp = 0;

6
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/DamageDoneInfo.java
View File

@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public final class DamageDoneInfo public final class DamageDoneInfo
{ {
private final L2PcInstance _attacker; private final L2PcInstance _attacker;
private int _damage = 0; private long _damage = 0;
public DamageDoneInfo(L2PcInstance attacker) public DamageDoneInfo(L2PcInstance attacker)
{ {
@ -36,12 +36,12 @@ public final class DamageDoneInfo
return _attacker; return _attacker;
} }
public void addDamage(int damage) public void addDamage(long damage)
{ {
_damage += damage; _damage += damage;
} }
public int getDamage() public long getDamage()
{ {
return _damage; return _damage;
} }

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Party.java
View File

@ -834,7 +834,7 @@ public class L2Party extends AbstractPlayerGroup
* @param partyDmg * @param partyDmg
* @param target * @param target
*/ */
public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, int partyDmg, L2Attackable target) public void distributeXpAndSp(double xpReward, double spReward, List<L2PcInstance> rewardedMembers, int topLvl, long partyDmg, L2Attackable target)
{ {
final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl); final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl);

10
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@ -348,7 +348,7 @@ public class L2Attackable extends L2Npc
final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>(); final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
L2PcInstance maxDealer = null; L2PcInstance maxDealer = null;
int maxDamage = 0; long maxDamage = 0;
long totalDamage = 0; long totalDamage = 0;
// While Iterating over This Map Removing Object is Not Allowed // While Iterating over This Map Removing Object is Not Allowed
// Go through the _aggroList of the L2Attackable // Go through the _aggroList of the L2Attackable
@ -359,7 +359,7 @@ public class L2Attackable extends L2Npc
if (attacker != null) if (attacker != null)
{ {
// Get damages done by this attacker // Get damages done by this attacker
final int damage = info.getDamage(); final long damage = info.getDamage();
// Prevent unwanted behavior // Prevent unwanted behavior
if (damage > 1) if (damage > 1)
@ -450,7 +450,7 @@ public class L2Attackable extends L2Npc
final L2PcInstance attacker = reward.getAttacker(); final L2PcInstance attacker = reward.getAttacker();
// Total amount of damage done // Total amount of damage done
final int damage = reward.getDamage(); final long damage = reward.getDamage();
// Get party // Get party
final L2Party attackerParty = attacker.getParty(); final L2Party attackerParty = attacker.getParty();
@ -524,7 +524,7 @@ public class L2Attackable extends L2Npc
else else
{ {
// share with party members // share with party members
int partyDmg = 0; long partyDmg = 0;
double partyMul = 1; double partyMul = 1;
int partyLvl = 0; int partyLvl = 0;
@ -1307,7 +1307,7 @@ public class L2Attackable extends L2Npc
* @param totalDamage The total damage done * @param totalDamage The total damage done
* @return * @return
*/ */
private double[] calculateExpAndSp(int charLevel, int damage, long totalDamage) private double[] calculateExpAndSp(int charLevel, long damage, long totalDamage)
{ {
final int levelDiff = charLevel - getLevel(); final int levelDiff = charLevel - getLevel();
double xp = 0; double xp = 0;