DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE when loading a replay without marker keyframes

Browse Source
This commit is contained in:
johni0702
2015-07-13 12:21:18 +02:00
parent a9ded2bc1d
commit d29cc85dc8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
View File

@@ -314,7 +314,7 @@ public class ReplayHandler {
mc.displayGuiScreen(new GuiYesNo(new GuiYesNoCallback() { mc.displayGuiScreen(new GuiYesNo(new GuiYesNoCallback() {
@Override @Override
public void confirmClicked(boolean result, int id) { public void confirmClicked(boolean result, int id) {
if(result) { if (result) {
resetKeyframes(resetMarkers); resetKeyframes(resetMarkers);
} }
@@ -392,7 +392,11 @@ public class ReplayHandler {
KeyframeSet[] paths = currentReplayFile.paths().get(); KeyframeSet[] paths = currentReplayFile.paths().get();
ReplayHandler.setKeyframeRepository(paths == null ? new KeyframeSet[0] : paths, false); ReplayHandler.setKeyframeRepository(paths == null ? new KeyframeSet[0] : paths, false);
KeyframeList<Marker> markerList = new KeyframeList<Marker>(currentReplayFile.markers().get()); List<Keyframe<Marker>> rawMarkerList = currentReplayFile.markers().get();
if (rawMarkerList == null) {
rawMarkerList = Collections.emptyList();
}
KeyframeList<Marker> markerList = new KeyframeList<Marker>(rawMarkerList);
ReplayHandler.setMarkers(markerList, false); ReplayHandler.setMarkers(markerList, false);
ReplayHandler.initialMarkers = markerList; ReplayHandler.initialMarkers = markerList;