From 4a5f66cab965a2c4f8e50ee64ea3054f322b7222 Mon Sep 17 00:00:00 2001
From: CrushedPixel <crushedpixelmaps@gmail.com>
Date: Sun, 26 Jul 2015 12:38:41 +0200
Subject: [PATCH] Fix LegacyKeyframeSetAdapter swallowing spectatedEntityID
 values of non-legacy Keyframes

---
 .../replaymod/utils/LegacyKeyframeSetAdapter.java           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/crushedpixel/replaymod/utils/LegacyKeyframeSetAdapter.java b/src/main/java/eu/crushedpixel/replaymod/utils/LegacyKeyframeSetAdapter.java
index 3b8cbe65..92593139 100644
--- a/src/main/java/eu/crushedpixel/replaymod/utils/LegacyKeyframeSetAdapter.java
+++ b/src/main/java/eu/crushedpixel/replaymod/utils/LegacyKeyframeSetAdapter.java
@@ -53,7 +53,11 @@ public class LegacyKeyframeSetAdapter extends TypeAdapter<KeyframeSet[]> {
                                 spectatedEntityID = in.nextInt();
                             }
                         }
-                        newKeyframe.getValue().setSpectatedEntityID(spectatedEntityID);
+
+                        if(spectatedEntityID != null) {
+                            newKeyframe.getValue().setSpectatedEntityID(spectatedEntityID);
+                        }
+
                         in.endObject();
 
                         keyframes.add(newKeyframe);