From 609c731dc093dc2a293e6681d7956fae5568d1b7 Mon Sep 17 00:00:00 2001
From: CrushedPixel <crushedpixelmaps@gmail.com>
Date: Thu, 9 Jul 2015 16:30:42 +0200
Subject: [PATCH] Got rid of the OpenEmbeddedChannel, an artifact of the
 ReplayMod's very beginning. Rest in Peace, old friend.

---
 .../replaymod/replay/OpenEmbeddedChannel.java | 30 -------------------
 .../replaymod/replay/ReplayHandler.java       |  7 +++--
 2 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100755 src/main/java/eu/crushedpixel/replaymod/replay/OpenEmbeddedChannel.java

diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/OpenEmbeddedChannel.java b/src/main/java/eu/crushedpixel/replaymod/replay/OpenEmbeddedChannel.java
deleted file mode 100755
index 0eb0794d..00000000
--- a/src/main/java/eu/crushedpixel/replaymod/replay/OpenEmbeddedChannel.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.crushedpixel.replaymod.replay;
-
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.embedded.EmbeddedChannel;
-import net.minecraft.network.NetworkManager;
-
-public class OpenEmbeddedChannel extends EmbeddedChannel {
-
-    private boolean ignoreClose = false;
-
-    public OpenEmbeddedChannel(NetworkManager networkManager) {
-        super(networkManager);
-    }
-
-    @Override
-    public boolean finish() {
-        System.out.println("wanted to finish");
-        ignoreClose = true;
-        return super.finish();
-    }
-
-    @Override
-    public ChannelFuture close() {
-        if(ignoreClose) {
-            ignoreClose = false;
-            return null;
-        }
-        return pipeline().close();
-    }
-}
diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
index 6e42a7ff..0f66c378 100755
--- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
@@ -14,6 +14,7 @@ import eu.crushedpixel.replaymod.settings.RenderOptions;
 import eu.crushedpixel.replaymod.utils.ReplayFile;
 import eu.crushedpixel.replaymod.utils.ReplayFileIO;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.embedded.EmbeddedChannel;
 import lombok.Getter;
 import lombok.Setter;
 import net.minecraft.client.Minecraft;
@@ -41,7 +42,7 @@ public class ReplayHandler {
     public static long lastExit = 0;
     private static NetworkManager networkManager;
     private static Minecraft mc = Minecraft.getMinecraft();
-    private static OpenEmbeddedChannel channel;
+    private static EmbeddedChannel channel;
     private static int realTimelinePosition = 0;
 
     private static Keyframe selectedKeyframe;
@@ -429,7 +430,7 @@ public class ReplayHandler {
         INetHandlerPlayClient pc = new NetHandlerPlayClient(mc, null, networkManager, new GameProfile(UUID.randomUUID(), "Player"));
         networkManager.setNetHandler(pc);
 
-        channel = new OpenEmbeddedChannel(networkManager);
+        channel = new EmbeddedChannel(networkManager);
         channel.attr(NetworkDispatcher.FML_DISPATCHER).set(new NetworkDispatcher(networkManager));
 
         // Open replay
@@ -488,7 +489,7 @@ public class ReplayHandler {
         INetHandlerPlayClient pc = new NetHandlerPlayClient(mc, null, networkManager, new GameProfile(UUID.randomUUID(), "Player"));
         networkManager.setNetHandler(pc);
 
-        channel = new OpenEmbeddedChannel(networkManager);
+        channel = new EmbeddedChannel(networkManager);
         channel.attr(NetworkDispatcher.FML_DISPATCHER).set(new NetworkDispatcher(networkManager));
 
         channel.pipeline().addFirst(ReplayMod.replaySender);