From b759d282f2dac512d293d31bc670549076e2b77b Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Sun, 24 May 2015 13:05:52 +0200 Subject: [PATCH] Prevented NPE when moving watched Objects to DataWatcher --- .../replaymod/recording/PacketListener.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/recording/PacketListener.java b/src/main/java/eu/crushedpixel/replaymod/recording/PacketListener.java index 554b857d..4a9983ff 100755 --- a/src/main/java/eu/crushedpixel/replaymod/recording/PacketListener.java +++ b/src/main/java/eu/crushedpixel/replaymod/recording/PacketListener.java @@ -98,16 +98,20 @@ public class PacketListener extends DataListener { if(packet instanceof S0FPacketSpawnMob) { S0FPacketSpawnMob p = (S0FPacketSpawnMob) packet; p.field_149043_l = new DataWatcher(null); - for(DataWatcher.WatchableObject wo : (List)p.func_149027_c()) { - p.field_149043_l.addObject(wo.getDataValueId(), wo.getObject()); + if(p.func_149027_c() != null) { + for(DataWatcher.WatchableObject wo : (List) p.func_149027_c()) { + p.field_149043_l.addObject(wo.getDataValueId(), wo.getObject()); + } } } if(packet instanceof S0CPacketSpawnPlayer) { S0CPacketSpawnPlayer p = (S0CPacketSpawnPlayer) packet; p.field_148960_i = new DataWatcher(null); - for(DataWatcher.WatchableObject wo : (List)p.func_148944_c()) { - p.field_148960_i.addObject(wo.getDataValueId(), wo.getObject()); + if(p.func_148944_c() != null) { + for(DataWatcher.WatchableObject wo : (List) p.func_148944_c()) { + p.field_148960_i.addObject(wo.getDataValueId(), wo.getObject()); + } } }