Fixed NPE at stats update.

Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-11-22 17:20:28 +00:00
parent 88a3b5b381
commit 9c9220457b
17 changed files with 36 additions and 19 deletions
@@ -4109,6 +4109,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4129,7 +4130,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4115,6 +4115,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4135,7 +4136,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4117,6 +4117,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4137,7 +4138,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4112,6 +4112,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4132,7 +4133,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4090,6 +4090,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4110,7 +4111,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4090,6 +4090,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4110,7 +4111,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4091,6 +4091,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4111,7 +4112,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4011,6 +4011,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4031,7 +4032,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4177,11 +4177,12 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if (isInParty() && (needCpUpdate || needHpUpdate || needMpUpdate()))
if ((party != null) && (needCpUpdate || needHpUpdate || needMpUpdate()))
{
_party.broadcastToPartyMembers(this, new PartySmallWindowUpdate(this));
party.broadcastToPartyMembers(this, new PartySmallWindowUpdate(this));
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4089,11 +4089,12 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if (isInParty() && (needCpUpdate || needHpUpdate || needMpUpdate()))
if ((party != null) && (needCpUpdate || needHpUpdate || needMpUpdate()))
{
_party.broadcastToPartyMembers(this, new PartySmallWindowUpdate(this));
party.broadcastToPartyMembers(this, new PartySmallWindowUpdate(this));
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4084,6 +4084,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4104,7 +4105,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4085,6 +4085,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4105,7 +4106,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4068,6 +4068,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4088,7 +4089,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4079,6 +4079,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4099,7 +4100,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4079,6 +4079,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4099,7 +4100,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -3982,6 +3982,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4002,7 +4003,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))
@@ -4085,6 +4085,7 @@ public class PlayerInstance extends Playable
final boolean needCpUpdate = needCpUpdate();
final boolean needHpUpdate = needHpUpdate();
final boolean needMpUpdate = needMpUpdate();
final Party party = getParty();
// Check if a party is in progress and party window update is usefull
if ((_party != null) && (needCpUpdate || needHpUpdate || needMpUpdate))
@@ -4105,7 +4106,7 @@ public class PlayerInstance extends Playable
partyWindow.addComponentType(PartySmallWindowUpdateType.CURRENT_MP);
partyWindow.addComponentType(PartySmallWindowUpdateType.MAX_MP);
}
_party.broadcastToPartyMembers(this, partyWindow);
party.broadcastToPartyMembers(this, partyWindow);
}
if (_inOlympiadMode && _OlympiadStart && (needCpUpdate || needHpUpdate))