From 0614b5e750f013af14dab4c25533f398cba988b3 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Fri, 17 Jul 2015 02:25:51 +0200 Subject: [PATCH] Prevent "Synchronize Timelines" feature from exceeding the Keyframe Timeline length --- .../java/eu/crushedpixel/replaymod/replay/ReplayHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java index 388c53cc..bd687010 100755 --- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java @@ -8,6 +8,7 @@ import eu.crushedpixel.replaymod.assets.CustomObjectRepository; import eu.crushedpixel.replaymod.entities.CameraEntity; import eu.crushedpixel.replaymod.events.KeyframesModifyEvent; import eu.crushedpixel.replaymod.events.ReplayExitEvent; +import eu.crushedpixel.replaymod.gui.overlay.GuiReplayOverlay; import eu.crushedpixel.replaymod.holders.*; import eu.crushedpixel.replaymod.interpolation.KeyframeList; import eu.crushedpixel.replaymod.registry.PlayerHandler; @@ -554,7 +555,7 @@ public class ReplayHandler { prevRealTime = keyframe.getRealTimestamp(); } - int newCursorPos = prevRealTime+(curTime-prevTime); + int newCursorPos = Math.min(GuiReplayOverlay.KEYFRAME_TIMELINE_LENGTH, prevRealTime+(curTime-prevTime)); setRealTimelineCursor(newCursorPos); }