From 1f2c05e696219ab718cfd9f34aa6c6e5eacfbbc6 Mon Sep 17 00:00:00 2001
From: johni0702 <me@johni0702.de>
Date: Sun, 13 Nov 2016 17:09:37 +0100
Subject: [PATCH] Fix spectating player entities past death and respawn (fixes
 #36)

While spectating, a special camera controller should be active. However after
a world change (which happens when the player dies), the camera is recreated
with the default controller, same when the controller setting is changed.

Also fixes the spectated entity if the player respawns in the same dimension
---
 .../replaymod/replay/camera/CameraEntity.java    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/replaymod/replay/camera/CameraEntity.java b/src/main/java/com/replaymod/replay/camera/CameraEntity.java
index dc20471b..01bb4a99 100755
--- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java
+++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java
@@ -69,7 +69,11 @@ public class CameraEntity extends EntityPlayerSP {
         super(mcIn, worldIn, netHandlerPlayClient, statFileWriter);
         FMLCommonHandler.instance().bus().register(eventHandler);
         MinecraftForge.EVENT_BUS.register(eventHandler);
-        cameraController = ReplayModReplay.instance.createCameraController(this);
+        if (ReplayModReplay.instance.getReplayHandler().getSpectatedUUID() == null) {
+            cameraController = ReplayModReplay.instance.createCameraController(this);
+        } else {
+            cameraController = new SpectatorCameraController(this);
+        }
     }
 
     /**
@@ -151,7 +155,9 @@ public class CameraEntity extends EntityPlayerSP {
             // This is important if the spectated player respawns as their
             // entity is recreated and we have to spectate a new entity
             UUID spectating = ReplayModReplay.instance.getReplayHandler().getSpectatedUUID();
-            if (spectating != null && (view.getUniqueID() != spectating || view.worldObj != worldObj)) {
+            if (spectating != null && (view.getUniqueID() != spectating
+                    || view.worldObj != worldObj)
+                    || worldObj.getEntityByID(view.getEntityId()) != view) {
                 view = worldObj.getPlayerEntityByUUID(spectating);
                 if (view != null) {
                     mc.setRenderViewEntity(view);
@@ -354,7 +360,11 @@ public class CameraEntity extends EntityPlayerSP {
         @SubscribeEvent
         public void onSettingsChanged(SettingsChangedEvent event) {
             if (event.getKey() == Setting.CAMERA) {
-                cameraController = ReplayModReplay.instance.createCameraController(CameraEntity.this);
+                if (ReplayModReplay.instance.getReplayHandler().getSpectatedUUID() == null) {
+                    cameraController = ReplayModReplay.instance.createCameraController(CameraEntity.this);
+                } else {
+                    cameraController = new SpectatorCameraController(CameraEntity.this);
+                }
             }
         }