From 6e9a77098a5009490f5d9ba2e3838de4e42103ba Mon Sep 17 00:00:00 2001
From: CrushedPixel <crushedpixelmaps@gmail.com>
Date: Wed, 22 Jul 2015 23:13:21 +0200
Subject: [PATCH] When clicking Time/Marker Keyframes, the time is now traveled
 with the "Please wait" screen

---
 .../elements/timelines/GuiKeyframeTimeline.java  |  2 +-
 .../elements/timelines/GuiMarkerTimeline.java    |  2 +-
 .../replaymod/gui/overlay/GuiReplayOverlay.java  | 16 +++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java
index 7bb4ce02..43555729 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java
@@ -78,7 +78,7 @@ public class GuiKeyframeTimeline extends GuiTimeline {
                 if(closest.getValue() instanceof AdvancedPosition) {
                     ReplayHandler.getCameraEntity().moveAbsolute((AdvancedPosition)closest.getValue());
                 } else if(closest.getValue() instanceof TimestampValue) {
-                    ReplayMod.replaySender.jumpToTime(((TimestampValue)closest.getValue()).asInt());
+                    ReplayMod.overlay.performJump(((TimestampValue)closest.getValue()).asInt());
                 }
             }
         }
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiMarkerTimeline.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiMarkerTimeline.java
index 8ab93421..7c84a3c6 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiMarkerTimeline.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiMarkerTimeline.java
@@ -68,7 +68,7 @@ public class GuiMarkerTimeline extends GuiTimeline {
             if(closest != null) {
                 //Jump to clicked Marker Keyframe
                 ReplayHandler.setLastPosition(closest.getValue().getPosition());
-                ReplayMod.replaySender.jumpToTime(closest.getRealTimestamp());
+                ReplayMod.overlay.performJump(closest.getRealTimestamp(), false);
             }
         }
 
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java b/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java
index d4e0549c..123be5de 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java
@@ -436,6 +436,10 @@ public class GuiReplayOverlay extends Gui {
     }
 
     public void performJump(long timelineTime) {
+        performJump(timelineTime, true);
+    }
+
+    public void performJump(long timelineTime, boolean setLastPosition) {
         if (timelineTime != -1) { // Click on timeline
             //When hurrying, no Timeline jumping etc. is possible
             if(!ReplayMod.replaySender.isHurrying()) {
@@ -443,11 +447,13 @@ public class GuiReplayOverlay extends Gui {
                     mc.displayGuiScreen(null);
                 }
 
-                CameraEntity cam = ReplayHandler.getCameraEntity();
-                if(cam != null) {
-                    ReplayHandler.setLastPosition(new AdvancedPosition(cam.posX, cam.posY, cam.posZ, cam.rotationPitch, cam.rotationYaw));
-                } else {
-                    ReplayHandler.setLastPosition(null);
+                if(setLastPosition) {
+                    CameraEntity cam = ReplayHandler.getCameraEntity();
+                    if(cam != null) {
+                        ReplayHandler.setLastPosition(new AdvancedPosition(cam.posX, cam.posY, cam.posZ, cam.rotationPitch, cam.rotationYaw));
+                    } else {
+                        ReplayHandler.setLastPosition(null);
+                    }
                 }
 
                 long diff = timelineTime - ReplayMod.replaySender.getDesiredTimestamp();