From 08b2d5b7e84680380bece01fe99dc98f7f5288e1 Mon Sep 17 00:00:00 2001 From: Myles Date: Tue, 20 Dec 2016 20:11:21 +0000 Subject: [PATCH] Fix #604 --- .../protocol1_9to1_8/DeathListener.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java index 5ac730080..164ffb394 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java @@ -37,16 +37,19 @@ public class DeathListener extends ViaBukkitListener { Via.getPlatform().runSync(new Runnable() { @Override public void run() { - PacketWrapper wrapper = new PacketWrapper(0x2C, null, getUserConnection(p)); - try { - wrapper.write(Type.VAR_INT, 2); // Event - Entity dead - wrapper.write(Type.VAR_INT, p.getEntityId()); // Player ID - wrapper.write(Type.INT, p.getEntityId()); // Entity ID - Protocol1_9TO1_8.FIX_JSON.write(wrapper, msg); // Message + // If online + if(getUserConnection(p) != null) { + PacketWrapper wrapper = new PacketWrapper(0x2C, null, getUserConnection(p)); + try { + wrapper.write(Type.VAR_INT, 2); // Event - Entity dead + wrapper.write(Type.VAR_INT, p.getEntityId()); // Player ID + wrapper.write(Type.INT, p.getEntityId()); // Entity ID + Protocol1_9TO1_8.FIX_JSON.write(wrapper, msg); // Message - wrapper.send(Protocol1_9TO1_8.class); - } catch (Exception e) { - e.printStackTrace(); + wrapper.send(Protocol1_9TO1_8.class); + } catch (Exception e) { + e.printStackTrace(); + } } } });