From 716c729d581f891235a8ef19e4b1495e9f128bef Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Tue, 2 Jun 2015 12:03:54 +0200 Subject: [PATCH] Prevented NPE when joining a Singleplayer World after spectating an Entity in the Replay Viewer --- .../java/eu/crushedpixel/replaymod/entities/CameraEntity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java b/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java index ddc15d92..8d744994 100755 --- a/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java +++ b/src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java @@ -37,8 +37,9 @@ public class CameraEntity extends EntityPlayer { @SubscribeEvent public void tick(TickEvent.ClientTickEvent event) { if (event.phase == TickEvent.Phase.END) { + if(!ReplayHandler.isInReplay()) return; Entity view = Minecraft.getMinecraft().getRenderViewEntity(); - if (view != this) { + if (view != this && view != null) { prevPosX = view.prevPosX; prevPosY = view.prevPosY; prevPosZ = view.prevPosZ;