From 4cb9359eb1643376d5527cbb6550884ba7cd8894 Mon Sep 17 00:00:00 2001 From: Obique Date: Wed, 14 Jan 2015 15:26:33 -0600 Subject: [PATCH] Fixed null pointer exception where the player could be null --- src/services/galaxy/ConnectionService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/services/galaxy/ConnectionService.java b/src/services/galaxy/ConnectionService.java index f28419c14..42b0c93e1 100644 --- a/src/services/galaxy/ConnectionService.java +++ b/src/services/galaxy/ConnectionService.java @@ -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()); } } }