diff --git a/gateway/EaglercraftXVelocity/EaglerXVelocity-Latest.jar b/gateway/EaglercraftXVelocity/EaglerXVelocity-Latest.jar
index 03b6f74d..b77cba0a 100644
Binary files a/gateway/EaglercraftXVelocity/EaglerXVelocity-Latest.jar and b/gateway/EaglercraftXVelocity/EaglerXVelocity-Latest.jar differ
diff --git a/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/EaglerXVelocityVersion.java b/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/EaglerXVelocityVersion.java
index f3f1f5be..9fdeb1b5 100644
--- a/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/EaglerXVelocityVersion.java
+++ b/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/EaglerXVelocityVersion.java
@@ -17,14 +17,14 @@ package net.lax1dude.eaglercraft.v1_8.plugin.gateway_velocity;
  */
 public class EaglerXVelocityVersion {
 
-	public static final String NATIVE_VELOCITY_BUILD = "3.4.0-SNAPSHOT:71feb11b:b461";
-	public static final String NATIVE_VELOCITY_BUILD_DL = "https://api.papermc.io/v2/projects/velocity/versions/3.4.0-SNAPSHOT/builds/461/downloads/velocity-3.4.0-SNAPSHOT-461.jar";
+	public static final String NATIVE_VELOCITY_BUILD = "3.4.0-SNAPSHOT:6995f415:b464";
+	public static final String NATIVE_VELOCITY_BUILD_DL = "https://api.papermc.io/v2/projects/velocity/versions/3.4.0-SNAPSHOT/builds/464/downloads/velocity-3.4.0-SNAPSHOT-464.jar";
 
 	public static final String ID = "EaglerXVelocity";
 	public static final String PLUGIN_ID = "eaglerxvelocity";
 	public static final String NAME = "EaglercraftXVelocity";
 	public static final String 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";
-	public static final String VERSION = "1.1.6";
+	public static final String VERSION = "1.1.7";
 	public static final String[] AUTHORS = new String[] { "lax1dude", "ayunami2000" };
 
 }
diff --git a/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/server/protocol/GameProtocolMessageController.java b/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/server/protocol/GameProtocolMessageController.java
index f027d194..95c30936 100644
--- a/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/server/protocol/GameProtocolMessageController.java
+++ b/gateway/EaglercraftXVelocity/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_velocity/server/protocol/GameProtocolMessageController.java
@@ -238,18 +238,20 @@ public class GameProtocolMessageController {
 			pkt = sendQueueV4.remove(0);
 			sendPluginMessage(owner, GamePluginMessageConstants.V4_CHANNEL, pkt);
 		}else {
-			int i, j, sendCount, totalLen;
+			int i, j, sendCount, totalLen, lastLen;
 			while(!sendQueueV4.isEmpty()) {
 				sendCount = 0;
 				totalLen = 0;
 				Iterator<byte[]> itr = sendQueueV4.iterator();
 				do {
 					i = itr.next().length;
-					totalLen += GamePacketOutputBuffer.getVarIntSize(i) + i;
+					lastLen = GamePacketOutputBuffer.getVarIntSize(i) + i;
+					totalLen += lastLen;
 					++sendCount;
 				}while(totalLen < 32760 && itr.hasNext());
 				if(totalLen >= 32760) {
 					--sendCount;
+					totalLen -= lastLen;
 				}
 				if(sendCount <= 1) {
 					pkt = sendQueueV4.remove(0);
diff --git a/gateway/EaglercraftXVelocity/src/main/resources/velocity-plugin.json b/gateway/EaglercraftXVelocity/src/main/resources/velocity-plugin.json
index 0794334c..0aaa0c74 100644
--- a/gateway/EaglercraftXVelocity/src/main/resources/velocity-plugin.json
+++ b/gateway/EaglercraftXVelocity/src/main/resources/velocity-plugin.json
@@ -1 +1 @@
-{"id":"eaglerxvelocity","name":"EaglercraftXVelocity","version":"1.1.6","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","authors":["lax1dude", "ayunami2000"],"dependencies":[],"main":"net.lax1dude.eaglercraft.v1_8.plugin.gateway_velocity.EaglerXVelocity"}
\ No newline at end of file
+{"id":"eaglerxvelocity","name":"EaglercraftXVelocity","version":"1.1.7","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","authors":["lax1dude", "ayunami2000"],"dependencies":[],"main":"net.lax1dude.eaglercraft.v1_8.plugin.gateway_velocity.EaglerXVelocity"}
\ No newline at end of file
diff --git a/gateway_version_velocity b/gateway_version_velocity
index ab679818..a5ba9325 100644
--- a/gateway_version_velocity
+++ b/gateway_version_velocity
@@ -1 +1 @@
-1.1.6
\ No newline at end of file
+1.1.7
\ No newline at end of file