From a34bbbcd6852a2c3f5e42a0b9c4f355d38a1a8a0 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 21 May 2017 11:51:19 +0200 Subject: [PATCH] Fix NPE when spectating a player without a camera entity --- src/main/java/com/replaymod/replay/ReplayHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/replaymod/replay/ReplayHandler.java b/src/main/java/com/replaymod/replay/ReplayHandler.java index 6d867cf4..8a9f4c82 100755 --- a/src/main/java/com/replaymod/replay/ReplayHandler.java +++ b/src/main/java/com/replaymod/replay/ReplayHandler.java @@ -209,6 +209,9 @@ public class ReplayHandler { */ public void spectateEntity(Entity e) { CameraEntity cameraEntity = getCameraEntity(); + if (cameraEntity == null) { + return; // Cannot spectate if we have no camera + } if (e == null || e == cameraEntity) { spectating = null; e = cameraEntity;