From 2fe3e2091b463711edac6da131acda8637e052a1 Mon Sep 17 00:00:00 2001
From: CrushedPixel <crushedpixelmaps@gmail.com>
Date: Sat, 9 May 2015 17:43:18 +0200
Subject: [PATCH] Removed possible sources of issues with the Replay Speed
 value

---
 .../crushedpixel/replaymod/events/GuiEventHandler.java   | 1 +
 .../replaymod/gui/GuiKeyframeRepository.java             | 4 ----
 .../crushedpixel/replaymod/gui/GuiSpectateSelection.java | 9 ---------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java
index 3cd623cd..f8a8bc0d 100755
--- a/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java
@@ -121,6 +121,7 @@ public class GuiEventHandler {
     @SubscribeEvent
     public void onInit(InitGuiEvent event) {
         if(event.gui instanceof GuiIngameMenu && ReplayHandler.isInReplay()) {
+            ReplayMod.replaySender.setReplaySpeed(0);
             for(GuiButton b : new ArrayList<GuiButton>(event.buttonList)) {
                 if(b.id == 1) {
                     b.displayString = I18n.format("replaymod.gui.exit");
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java
index a634fb89..eb0f9cfa 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java
@@ -37,11 +37,8 @@ public class GuiKeyframeRepository extends GuiScreen {
 
     private int currentSetTimeKeyframeCount, currentSetPositionKeyframeCount, currentSetDuration;
 
-    private double prevSpeed;
-
     public GuiKeyframeRepository(KeyframeSet[] keyframeRepository) {
         this.keyframeRepository = keyframeRepository;
-        prevSpeed = ReplayMod.replaySender.getReplaySpeed();
         ReplayMod.replaySender.setReplaySpeed(0);
     }
 
@@ -226,7 +223,6 @@ public class GuiKeyframeRepository extends GuiScreen {
         ArrayList<KeyframeSet> copy = new ArrayList<KeyframeSet>(keyframeSetList.getCopyOfElements());
         this.keyframeRepository = copy.toArray(new KeyframeSet[copy.size()]);
         ReplayHandler.setKeyframeRepository(keyframeRepository, true);
-        ReplayMod.replaySender.setReplaySpeed(prevSpeed);
     }
 
     @Override
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiSpectateSelection.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiSpectateSelection.java
index 5bb4beb2..71ad6245 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiSpectateSelection.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiSpectateSelection.java
@@ -29,7 +29,6 @@ public class GuiSpectateSelection extends GuiScreen {
 
     private int lowerBound;
 
-    private double prevSpeed;
     private boolean drag = false;
     private int lastY = 0;
     private int fitting = 0;
@@ -37,8 +36,6 @@ public class GuiSpectateSelection extends GuiScreen {
     private final String screenTitle = I18n.format("replaymod.gui.spectate.title");
 
     public GuiSpectateSelection(List<EntityPlayer> players) {
-        this.prevSpeed = ReplayMod.replaySender.getReplaySpeed();
-
         Collections.sort(players, new PlayerComparator());
 
         this.players = new ArrayList<Pair<EntityPlayer, ResourceLocation>>();
@@ -84,7 +81,6 @@ public class GuiSpectateSelection extends GuiScreen {
             int off = mouseY - 30;
             int p = (off / 21) + upperPlayer;
             ReplayHandler.spectateEntity(players.get(p).first());
-            ReplayMod.replaySender.setReplaySpeed(prevSpeed);
             mc.displayGuiScreen(null);
         }
     }
@@ -115,11 +111,6 @@ public class GuiSpectateSelection extends GuiScreen {
         super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
     }
 
-    @Override
-    public void onGuiClosed() {
-        ReplayMod.replaySender.setReplaySpeed(prevSpeed);
-    }
-
     @Override
     protected void mouseReleased(int mouseX, int mouseY, int state) {
         drag = false;