From 3de7394a0c4dabcec280f67f24dcea0834265f5c Mon Sep 17 00:00:00 2001 From: johni0702 Date: Mon, 29 Jun 2015 22:28:58 +0200 Subject: [PATCH] Compare int and Integer using Objects.equals to prevent NPE --- .../replaymod/events/handlers/RecordingHandler.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/events/handlers/RecordingHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/handlers/RecordingHandler.java index 3a4ca257..fca13eb6 100755 --- a/src/main/java/eu/crushedpixel/replaymod/events/handlers/RecordingHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/events/handlers/RecordingHandler.java @@ -24,6 +24,8 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemPickupEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent; +import java.util.Objects; + public class RecordingHandler { public static final int entityID = Integer.MIN_VALUE + 9001; @@ -34,7 +36,7 @@ public class RecordingHandler { private int ticksSinceLastCorrection = 0; private boolean wasSleeping = false; private int lastRiding = -1; - private Integer rotationYawHeadBefore = 0; + private Integer rotationYawHeadBefore = null; @SubscribeEvent public void onPlayerJoin(EntityJoinWorldEvent e) { @@ -156,7 +158,7 @@ public class RecordingHandler { //HEAD POS int rotationYawHead = ((int)(e.player.rotationYawHead * 256.0F / 360.0F)); - if(rotationYawHead != rotationYawHeadBefore) { + if(!Objects.equals(rotationYawHead, rotationYawHeadBefore)) { S19PacketEntityHeadLook head = new S19PacketEntityHeadLook(); ByteBuf bb1 = Unpooled.buffer(); PacketBuffer pb1 = new PacketBuffer(bb1);