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

Fixed potential Attackable NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-10-01 10:24:04 +00:00
parent 27f19f4e0b
commit 97180dfefc
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -134,16 +134,16 @@ public class Attackable extends Npc
} }
else if (isDead()) else if (isDead())
{ {
final Attackable attackable = this; synchronized (this)
synchronized (attackable)
{ {
if (!_killedAlready) if (!_killedAlready)
{ {
_killedAlready = true; _killedAlready = true;
stopRandomWalking(); stopRandomWalking();
stopTargetScan(); stopTargetScan();
calculateRewards(attacker); calculateRewards();
if (attacker != null)
{
final Player killer = attacker.getActingPlayer(); final Player killer = attacker.getActingPlayer();
if ((killer != null) && (killer.getKarma() > 0)) if ((killer != null) && (killer.getKarma() > 0))
{ {
@@ -153,8 +153,9 @@ public class Attackable extends Npc
} }
} }
} }
}
private void calculateRewards(Creature lastAttacker) private void calculateRewards()
{ {
// TODO: Figure iterator logic and replace with for, if possible. // TODO: Figure iterator logic and replace with for, if possible.
Iterator<WorldObject> it = _aggroList.keySet().iterator(); Iterator<WorldObject> it = _aggroList.keySet().iterator();