From 9576e7b35ccb50e68d8f8eb7a6304992acfe099b Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Thu, 16 Jul 2015 13:50:10 +0200 Subject: [PATCH] Prevented NPE in TickAndRenderListener --- .../replaymod/events/handlers/TickAndRenderListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/events/handlers/TickAndRenderListener.java b/src/main/java/eu/crushedpixel/replaymod/events/handlers/TickAndRenderListener.java index 3a0e8165..4da31f27 100644 --- a/src/main/java/eu/crushedpixel/replaymod/events/handlers/TickAndRenderListener.java +++ b/src/main/java/eu/crushedpixel/replaymod/events/handlers/TickAndRenderListener.java @@ -54,7 +54,7 @@ public class TickAndRenderListener { if(ReplayHandler.isInPath()) ReplayProcess.unblockAndTick(false); if(ReplayHandler.isCamera()) mc.setRenderViewEntity(ReplayHandler.getCameraEntity()); - if((mc.getRenderViewEntity() == mc.thePlayer || !mc.getRenderViewEntity().isEntityAlive()) + if(mc.getRenderViewEntity() != null && (mc.getRenderViewEntity() == mc.thePlayer || !mc.getRenderViewEntity().isEntityAlive()) && ReplayHandler.getCameraEntity() != null && !ReplayHandler.isInPath()) { ReplayHandler.spectateCamera(); }