Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE in PartyOperationHandler (#321)

Browse Source
This commit is contained in:
MedicOP
2019-01-14 01:12:22 +01:00
committed by Ronan Lana
parent 51211cfb1e
commit 20bc1985b1
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/server/channel/handlers/PartyOperationHandler.java
View File

@@ -75,7 +75,7 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
c.announce(MaplePacketCreator.partyStatusMessage(10)); c.announce(MaplePacketCreator.partyStatusMessage(10));
return; return;
} }
if (player.getParty() == null) { if (party == null) {
partyplayer = new MaplePartyCharacter(player); partyplayer = new MaplePartyCharacter(player);
party = world.createParty(partyplayer); party = world.createParty(partyplayer);
player.setParty(party); player.setParty(party);
@@ -91,15 +91,17 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
break; break;
} }
case 2: { // leave/disband case 2: { // leave/disband
List<MapleCharacter> partymembers = player.getPartyMembers(); if (party != null) {
List<MapleCharacter> partymembers = player.getPartyMembers();
leaveParty(party, partyplayer, c); leaveParty(party, partyplayer, c);
player.partyOperationUpdate(party, partymembers); player.partyOperationUpdate(party, partymembers);
}
break; break;
} }
case 3: { // join case 3: { // join
int partyid = slea.readInt(); int partyid = slea.readInt();
if (player.getParty() == null) { if (party == null) {
party = world.getParty(partyid); party = world.getParty(partyid);
if (party != null) { if (party != null) {
if (party.getMembers().size() < 6) { if (party.getMembers().size() < 6) {
@@ -136,7 +138,7 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
} }
if (invited.getParty() == null) { if (invited.getParty() == null) {
if (player.getParty() == null) { if (party == null) {
if(player.getLevel() < 10 && !ServerConstants.USE_PARTY_FOR_STARTERS) { if(player.getLevel() < 10 && !ServerConstants.USE_PARTY_FOR_STARTERS) {
c.announce(MaplePacketCreator.partyStatusMessage(10)); c.announce(MaplePacketCreator.partyStatusMessage(10));
return; return;