DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare int and Integer using Objects.equals to prevent NPE

Browse Source
This commit is contained in:
johni0702
2015-06-29 22:28:58 +02:00
parent 586a9dbe1c
commit 3de7394a0c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/crushedpixel/replaymod/events/handlers/RecordingHandler.java
View File

@@ -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.PlayerEvent.PlayerRespawnEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent;
import java.util.Objects;
public class RecordingHandler { public class RecordingHandler {
public static final int entityID = Integer.MIN_VALUE + 9001; public static final int entityID = Integer.MIN_VALUE + 9001;
@@ -34,7 +36,7 @@ public class RecordingHandler {
private int ticksSinceLastCorrection = 0; private int ticksSinceLastCorrection = 0;
private boolean wasSleeping = false; private boolean wasSleeping = false;
private int lastRiding = -1; private int lastRiding = -1;
private Integer rotationYawHeadBefore = 0; private Integer rotationYawHeadBefore = null;
@SubscribeEvent @SubscribeEvent
public void onPlayerJoin(EntityJoinWorldEvent e) { public void onPlayerJoin(EntityJoinWorldEvent e) {
@@ -156,7 +158,7 @@ public class RecordingHandler {
//HEAD POS //HEAD POS
int rotationYawHead = ((int)(e.player.rotationYawHead * 256.0F / 360.0F)); int rotationYawHead = ((int)(e.player.rotationYawHead * 256.0F / 360.0F));
if(rotationYawHead != rotationYawHeadBefore) { if(!Objects.equals(rotationYawHead, rotationYawHeadBefore)) {
S19PacketEntityHeadLook head = new S19PacketEntityHeadLook(); S19PacketEntityHeadLook head = new S19PacketEntityHeadLook();
ByteBuf bb1 = Unpooled.buffer(); ByteBuf bb1 = Unpooled.buffer();
PacketBuffer pb1 = new PacketBuffer(bb1); PacketBuffer pb1 = new PacketBuffer(bb1);