projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-07 22:13:40 -04:00
Code Issues Projects Releases Wiki Activity

Fixed null pointer exception where the player could be null

Browse Source
This commit is contained in:
Obique
2015-01-14 15:26:33 -06:00
committed by Obique
parent 8cdff02e6a
commit 4cb9359eb1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/galaxy/ConnectionService.java
+2 -3
View File
@@ -33,11 +33,9 @@ public class ConnectionService extends Service {
for (Player p : zonedInPlayers) {
if (p.getTimeSinceLastPacket() > DISAPPEAR_THRESHOLD) {
p.setPlayerState(PlayerState.DISCONNECTED);
System.out.println(p.getCreatureObject().getName() + " has disappeared");
new PlayerEventIntent(p, PlayerEvent.PE_DISAPPEAR).broadcast();
} else if (p.getTimeSinceLastPacket() > LD_THRESHOLD) {
p.setPlayerState(PlayerState.LOGGED_OUT);
System.out.println(p.getCreatureObject().getName() + " has logged out");
}
}
}
@@ -89,7 +87,8 @@ public class ConnectionService extends Service {
if (((GalacticPacketIntent)i).getPacket() instanceof HeartBeatMessage) {
GalacticPacketIntent gpi = (GalacticPacketIntent) i;
Player p = gpi.getPlayerManager().getPlayerFromNetworkId(gpi.getNetworkId());
p.sendPacket(gpi.getPacket());
if (p != null)
p.sendPacket(gpi.getPacket());
}
}
}