diff --git a/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar b/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar
index f0ca3e7..241f289 100644
Binary files a/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar and b/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar differ
diff --git a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/EaglerXBungee.java b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/EaglerXBungee.java
index 5948203..2285d50 100644
--- a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/EaglerXBungee.java
+++ b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/EaglerXBungee.java
@@ -57,7 +57,7 @@ import net.md_5.bungee.BungeeCord;
  */
 public class EaglerXBungee extends Plugin {
 
-	public static final String NATIVE_BUNGEECORD_BUILD = "1.20-R0.3-SNAPSHOT:52ab21b:1844";
+	public static final String NATIVE_BUNGEECORD_BUILD = "1.20-R0.3-SNAPSHOT:e7e0b97:1845";
 	public static final String NATIVE_WATERFALL_BUILD = "1.20-R0.3-SNAPSHOT:a65bb68:578";
 	
 	static {
diff --git a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/EaglerChannelWrapper.java b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/EaglerChannelWrapper.java
index 4740ecb..3aeab75 100644
--- a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/EaglerChannelWrapper.java
+++ b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/EaglerChannelWrapper.java
@@ -36,7 +36,7 @@ public class EaglerChannelWrapper extends ChannelWrapper {
 		getHandle().pipeline().get(EaglerMinecraftDecoder.class).setProtocolVersion(protocol);
 	}
 
-	private Protocol lastProtocol = null;
+	private Protocol lastProtocol = Protocol.GAME;
 
 	public Protocol getEncodeProtocol() {
 		EaglerMinecraftEncoder enc;
diff --git a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/EaglerMinecraftDecoder.java b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/EaglerMinecraftDecoder.java
index e268402..aab59d2 100644
--- a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/EaglerMinecraftDecoder.java
+++ b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/EaglerMinecraftDecoder.java
@@ -111,7 +111,7 @@ public class EaglerMinecraftDecoder extends MessageToMessageDecoder<WebSocketFra
 		boolean isInputDirect = buf.isDirect();
 		if(!isInputDirect) {
 			int len = buf.readableBytes();
-			ByteBuf newBuf = buf.alloc().directBuffer(len, len);
+			ByteBuf newBuf = buf.alloc().directBuffer(len);
 			buf.readBytes(newBuf, len);
 			buf = newBuf;
 		}
diff --git a/gateway/EaglercraftXBungee/src/main/resources/plugin.yml b/gateway/EaglercraftXBungee/src/main/resources/plugin.yml
index e36bf0b..d35eb35 100644
--- a/gateway/EaglercraftXBungee/src/main/resources/plugin.yml
+++ b/gateway/EaglercraftXBungee/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: EaglercraftXBungee
 main: net.lax1dude.eaglercraft.v1_8.plugin.gateway_bungeecord.EaglerXBungee
-version: 1.2.4
+version: 1.2.5
 description: Plugin to allow EaglercraftX 1.8 players to join your network, or allow EaglercraftX 1.8 players to use your network as a proxy to join other networks
 author: lax1dude
\ No newline at end of file
diff --git a/gateway_version b/gateway_version
index b966e81..3a1f10e 100644
--- a/gateway_version
+++ b/gateway_version
@@ -1 +1 @@
-1.2.4
\ No newline at end of file
+1.2.5
\ No newline at end of file