From 560982a14a1643b7a0f66a7cfa4d07b900329eef Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Fri, 14 Jun 2019 14:09:42 +0200 Subject: [PATCH] Fix NPE when replay is closed but camera entity is still being rendered --- src/main/java/com/replaymod/replay/camera/CameraEntity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/replaymod/replay/camera/CameraEntity.java b/src/main/java/com/replaymod/replay/camera/CameraEntity.java index ef8142c8..61382e9e 100755 --- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java +++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java @@ -3,6 +3,7 @@ package com.replaymod.replay.camera; import com.replaymod.core.ReplayMod; import com.replaymod.core.SettingsRegistry; import com.replaymod.core.events.SettingsChangedCallback; +import com.replaymod.replay.ReplayHandler; import de.johni0702.minecraft.gui.utils.EventRegistrations; import com.replaymod.core.utils.Utils; import com.replaymod.replay.ReplayModReplay; @@ -363,7 +364,8 @@ public class CameraEntity //#if MC>=10800 @Override public boolean isSpectator() { - return ReplayModReplay.instance.getReplayHandler().isCameraView(); // Make sure we're treated as spectator + ReplayHandler replayHandler = ReplayModReplay.instance.getReplayHandler(); + return replayHandler == null || replayHandler.isCameraView(); // Make sure we're treated as spectator } //#endif