Fix LegacyKeyframeSetAdapter swallowing spectatedEntityID values of non-legacy Keyframes

2015-07-26 12:38:41 +02:00
parent ee2b028ed8
commit 4a5f66cab9
1 changed files with 5 additions and 1 deletions
--- 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);