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

Fixed party NPE by caching leader variable.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2021-07-23 23:18:40 +00:00
parent 27dc3eb506
commit e08d53462e
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java
View File

@@ -482,12 +482,13 @@ public class Party extends AbstractPlayerGroup
} }
} }
if (getLeader() != null) final PlayerInstance leader = getLeader();
if (leader != null)
{ {
getLeader().setParty(null); leader.setParty(null);
if (getLeader().isInDuel()) if (leader.isInDuel())
{ {
DuelManager.getInstance().onRemoveFromParty(getLeader()); DuelManager.getInstance().onRemoveFromParty(leader);
} }
} }
if (_positionBroadcastTask != null) if (_positionBroadcastTask != null)

10
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java
View File

@@ -495,14 +495,16 @@ public class Party extends AbstractPlayerGroup
} }
} }
if (getLeader() != null) final PlayerInstance leader = getLeader();
if (leader != null)
{ {
getLeader().setParty(null); leader.setParty(null);
if (getLeader().isInDuel()) if (leader.isInDuel())
{ {
DuelManager.getInstance().onRemoveFromParty(getLeader()); DuelManager.getInstance().onRemoveFromParty(leader);
} }
} }
if (_changeDistributionTypeRequestTask != null) if (_changeDistributionTypeRequestTask != null)
{ {
_changeDistributionTypeRequestTask.cancel(true); _changeDistributionTypeRequestTask.cancel(true);