diff --git a/BungeeCord b/BungeeCord
index 8a80435e..4dad940a 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 8a80435e647c358b0c2235549fabbda4627b532a
+Subproject commit 4dad940a2fee447f60b03c01d673d966b7908247
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index de7bf129..e9ffc58f 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 058ce1cb0fc175ecb9e9ac294d2146683a7036b1 Mon Sep 17 00:00:00 2001
+From 76b0f26f9bda2c55145f4269a088c4fa6bdd7a4a Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 19:33:31 +0200
 Subject: [PATCH] POM Changes
@@ -145,7 +145,7 @@ index 6be22739..a4516ed9 100644
              return;
          }
 diff --git a/chat/pom.xml b/chat/pom.xml
-index 71c4ce27..7db6020f 100644
+index 9a9bc506..b8c60c9f 100644
 --- a/chat/pom.xml
 +++ b/chat/pom.xml
 @@ -4,19 +4,19 @@
@@ -175,7 +175,7 @@ index 71c4ce27..7db6020f 100644
      <dependencies>
          <dependency>
 diff --git a/config/pom.xml b/config/pom.xml
-index 4b94f112..d245a60b 100644
+index 58f0b7ca..10d1d4ca 100644
 --- a/config/pom.xml
 +++ b/config/pom.xml
 @@ -4,19 +4,19 @@
@@ -514,7 +514,7 @@ index bd3a8ab8..49347e1d 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 7335e8b7..b882440f 100644
+index fb8077b8..4a4287eb 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -625,7 +625,7 @@ index 7335e8b7..b882440f 100644
 +             <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
-                 <version>3.3.1</version>
+                 <version>3.6.0</version>
 @@ -179,6 +196,7 @@
                      </dependency>
                  </dependencies>
@@ -634,7 +634,7 @@ index 7335e8b7..b882440f 100644
              <plugin>
                  <groupId>org.codehaus.mojo</groupId>
                  <artifactId>animal-sniffer-maven-plugin</artifactId>
-@@ -291,6 +309,15 @@
+@@ -300,6 +318,15 @@
                                  </goals>
                              </execution>
                          </executions>
@@ -650,7 +650,7 @@ index 7335e8b7..b882440f 100644
                      </plugin>
                      <plugin>
                          <groupId>org.projectlombok</groupId>
-@@ -339,6 +366,7 @@
+@@ -348,6 +375,7 @@
                                      <!-- lombok does not add @return or @param which causes warnings, so ignore -->
                                      <doclint>none</doclint>
                                      <sourcepath>${project.build.directory}/delombok</sourcepath>
@@ -848,5 +848,5 @@ index 5c611d8c..8860998c 100644
  
      <properties>
 -- 
-2.39.3 (Apple Git-146)
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
index 859f6aac..9903dacf 100644
--- a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
+++ b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
@@ -1,14 +1,14 @@
-From 34fdda895db367f225f49d94a55a8f04aa89842f Mon Sep 17 00:00:00 2001
+From 928238076c799877724e19af01698e94fd5e1c38 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 09:07:51 -0500
 Subject: [PATCH] Fixup ProtocolConstants
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-index b3d1c2bb..ad9aa920 100644
+index 1d0de625..fb356a66 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-@@ -125,6 +125,16 @@ public class ProtocolConstants
+@@ -126,6 +126,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
  
@@ -26,5 +26,5 @@ index b3d1c2bb..ad9aa920 100644
      {
  
 -- 
-2.47.1
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch b/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch
index 93329845..fe5af5dc 100644
--- a/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch
+++ b/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch
@@ -1,4 +1,4 @@
-From b212fd1b0a9b781f13e21b4c1e9c0432640baaf1 Mon Sep 17 00:00:00 2001
+From a5d1ebab518172129f7ae3aef9c78089bf78b296 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 3 May 2016 20:31:52 -0700
 Subject: [PATCH] Don't access a ByteBuf's underlying array
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't access a ByteBuf's underlying array
 It returns the underlying array storage, and does *not* return a view of the buffer as an array
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
-index 70b292f0..91f71c09 100644
+index 1a7d8512..8f500382 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
 @@ -3,6 +3,7 @@ package net.md_5.bungee.protocol.packet;
@@ -17,7 +17,7 @@ index 70b292f0..91f71c09 100644
  import java.io.ByteArrayInputStream;
  import java.io.DataInput;
  import java.io.DataInputStream;
-@@ -47,10 +48,23 @@ public class PluginMessage extends DefinedPacket
+@@ -49,10 +50,23 @@ public class PluginMessage extends DefinedPacket
              return "legacy:" + tag.toLowerCase( Locale.ROOT );
          }
      };
@@ -56,10 +56,10 @@ index b58a01c6..c7637608 100644
              }
  
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index d518d05f..21019091 100644
+index 64e9a764..f5b3f7a8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -325,7 +325,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -328,7 +328,7 @@ public class DownstreamBridge extends PacketHandler
  
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@@ -82,5 +82,5 @@ index 2446f489..380b6012 100644
      {
          @Override
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
index ce299c75..05fe0c40 100644
--- a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
+++ b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
@@ -1,4 +1,4 @@
-From 4ef93b430b7240ea845535477c4d3ac49f906088 Mon Sep 17 00:00:00 2001
+From 8ef76fafc7299276974eaafcb05ba2009c6491f9 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 14 Mar 2016 15:40:44 -0700
 Subject: [PATCH] Optimize uuid conversions
@@ -250,10 +250,10 @@ index e582808f..29cd91dd 100644
      }
  
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 224f231b..b7d7e71a 100644
+index 047e7129..4ec85bda 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -823,7 +823,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -798,7 +798,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {
@@ -263,5 +263,5 @@ index 224f231b..b7d7e71a 100644
  
      @Override
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0015-Micro-optimizations.patch b/BungeeCord-Patches/0015-Micro-optimizations.patch
index 8fb6d659..6e7251a5 100644
--- a/BungeeCord-Patches/0015-Micro-optimizations.patch
+++ b/BungeeCord-Patches/0015-Micro-optimizations.patch
@@ -1,4 +1,4 @@
-From 1aa3fbcfe8aaf58084220dfc5142cff546a0b6c2 Mon Sep 17 00:00:00 2001
+From 7cecf58bf32a07fd33157d1014bc00e12b6fc22b Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 19 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Micro-optimizations
@@ -8,10 +8,10 @@ Subject: [PATCH] Micro-optimizations
 - Don't create a data input stream for every plugin message we get from servers
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 21019091..b501f7bd 100644
+index f5b3f7a8..137d949e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -307,7 +307,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -310,7 +310,6 @@ public class DownstreamBridge extends PacketHandler
      @SuppressWarnings("checkstyle:avoidnestedblocks")
      public void handle(PluginMessage pluginMessage) throws Exception
      {
@@ -19,14 +19,14 @@ index 21019091..b501f7bd 100644
          PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
  
          if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -334,6 +333,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -337,6 +336,7 @@ public class DownstreamBridge extends PacketHandler
  
-         if ( pluginMessage.getTag().equals( "BungeeCord" ) )
+         if ( pluginMessage.getTag().equals( PluginMessage.BUNGEE_CHANNEL_LEGACY ) )
          {
 +            DataInput in = pluginMessage.getStream();
              ByteArrayDataOutput out = ByteStreams.newDataOutput();
              String subChannel = in.readUTF();
  
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
index d0fb970a..d8fa1bed 100644
--- a/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
+++ b/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
@@ -1,4 +1,4 @@
-From d68066bbfc93431041ec0df01945032b0ae69f70 Mon Sep 17 00:00:00 2001
+From 7636e8a2ea85640748b814f5121565b5acd054b9 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -37,10 +37,10 @@ index d79d5e5c..250e7620 100644
              {
                  packet.read( in, protocol, prot.getDirection(), protocolVersion );
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-index 8aa57ed4..7a26c419 100644
+index 40fdb868..34be8c00 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-@@ -917,14 +917,23 @@ public enum Protocol
+@@ -945,14 +945,23 @@ public enum Protocol
              return protocol;
          }
  
@@ -83,10 +83,10 @@ index 824166e5..b02121af 100644
  
          ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
 diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-index 206bc8d2..fab7e9b9 100644
+index c8fdb2e9..1bf73fd2 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-@@ -347,6 +347,12 @@ public abstract class EntityMap
+@@ -349,6 +349,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
  
@@ -100,5 +100,5 @@ index 206bc8d2..fab7e9b9 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.47.1
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
index a09e6a39..fa69311b 100644
--- a/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
+++ b/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
@@ -1,4 +1,4 @@
-From 67530bdaa956440c3c8a7f8a9b37e0b6a1ac62e5 Mon Sep 17 00:00:00 2001
+From 346da2f06a2a72f5d7a360e1bbc799c2b496d530 Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Improve server list ping logging
@@ -19,10 +19,10 @@ index b02121af..6f49765f 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index b501f7bd..1c075a9f 100644
+index 137d949e..3c286239 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -802,6 +802,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -805,6 +805,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -31,10 +31,10 @@ index b501f7bd..1c075a9f 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 1679e6ab..aaae7afa 100644
+index 4ec85bda..c09f59eb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -829,20 +829,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -804,20 +804,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String toString()
      {
@@ -57,7 +57,7 @@ index 1679e6ab..aaae7afa 100644
  
      @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 0961c6e6..e61fcc88 100644
+index e7d46d53..ba0ef69d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 @@ -404,6 +404,6 @@ public class UpstreamBridge extends PacketHandler
@@ -69,5 +69,5 @@ index 0961c6e6..e61fcc88 100644
      }
  }
 -- 
-2.47.1
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch b/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch
index f4820a78..313859b5 100644
--- a/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch
+++ b/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch
@@ -1,4 +1,4 @@
-From 6b92feb2426c2bd0866b6ee3aa7fc175ecea40ca Mon Sep 17 00:00:00 2001
+From da17763410befea67be74f9adbaf8538578c12fa Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sun, 7 Feb 2016 00:01:19 -0700
 Subject: [PATCH] Add a property to accept invalid ping packets
@@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm
 Fixes #23
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 72f6111e..fd577788 100644
+index c09f59eb..b8b7102c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -333,10 +333,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -329,10 +329,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          thisState = State.PING;
      }
  
@@ -29,5 +29,5 @@ index 72f6111e..fd577788 100644
          disconnect( "" );
      }
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0021-Better-Decompression-Sanity.patch b/BungeeCord-Patches/0021-Better-Decompression-Sanity.patch
index 3f9e8721..85ab0246 100644
--- a/BungeeCord-Patches/0021-Better-Decompression-Sanity.patch
+++ b/BungeeCord-Patches/0021-Better-Decompression-Sanity.patch
@@ -1,4 +1,4 @@
-From f5e7fcd4863418a7b0359249106b0c2587c90e75 Mon Sep 17 00:00:00 2001
+From 9f158dab29e80ae087b5ecb323b21cf62e2ca2ab Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Fri, 18 Mar 2016 10:53:24 -0700
 Subject: [PATCH] Better Decompression Sanity
@@ -6,7 +6,7 @@ Subject: [PATCH] Better Decompression Sanity
 Fixes #40
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/compress/PacketDecompressor.java b/proxy/src/main/java/net/md_5/bungee/compress/PacketDecompressor.java
-index 445ee947..eaedf4bc 100644
+index 1612ffcf..1cceba83 100644
 --- a/proxy/src/main/java/net/md_5/bungee/compress/PacketDecompressor.java
 +++ b/proxy/src/main/java/net/md_5/bungee/compress/PacketDecompressor.java
 @@ -1,5 +1,7 @@
@@ -17,25 +17,29 @@ index 445ee947..eaedf4bc 100644
  import com.google.common.base.Preconditions;
  import io.netty.buffer.ByteBuf;
  import io.netty.channel.ChannelHandlerContext;
-@@ -8,9 +10,11 @@ import java.util.List;
- import net.md_5.bungee.jni.zlib.BungeeZlib;
+@@ -9,10 +11,12 @@ import net.md_5.bungee.jni.zlib.BungeeZlib;
  import net.md_5.bungee.protocol.DefinedPacket;
+ import net.md_5.bungee.protocol.OverflowPacketException;
  
 +@RequiredArgsConstructor
  public class PacketDecompressor extends MessageToMessageDecoder<ByteBuf>
  {
  
+     private static final int MAX_DECOMPRESSED_LEN = 1 << 23;
 +    private final int compressionThreshold;
      private final BungeeZlib zlib = CompressFactory.zlib.newInstance();
  
      @Override
-@@ -34,12 +38,13 @@ public class PacketDecompressor extends MessageToMessageDecoder<ByteBuf>
-             out.add( in.retain() );
-         } else
-         {
+@@ -40,14 +44,12 @@ public class PacketDecompressor extends MessageToMessageDecoder<ByteBuf>
+             {
+                 throw new OverflowPacketException( "Packet may not be larger than " + MAX_DECOMPRESSED_LEN + " bytes" );
+             }
+-
+-            // Do not use size as max capacity, as its possible that the entity rewriter increases the size afterwards
+-            // This would result in a kick (it happens rarely as the entity ids size must differ)
+-            ByteBuf decompressed = ctx.alloc().directBuffer( size, MAX_DECOMPRESSED_LEN );
 +            Preconditions.checkArgument( size >= compressionThreshold, "Decompressed size %s less than compression threshold %s", size, compressionThreshold);
-             ByteBuf decompressed = ctx.alloc().directBuffer();
- 
++            ByteBuf decompressed = ctx.alloc().directBuffer();
              try
              {
                  zlib.process( in, decompressed );
@@ -45,18 +49,64 @@ index 445ee947..eaedf4bc 100644
                  out.add( decompressed );
                  decompressed = null;
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
-index a15ba5df..032b06d4 100644
+index a7627d40..557fcf22 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
-@@ -194,7 +194,7 @@ public class ChannelWrapper
+@@ -178,34 +178,27 @@ public class ChannelWrapper
+         return ch;
+     }
  
-         if ( ch.pipeline().get( PacketDecompressor.class ) == null && compressionThreshold >= 0 )
-         {
--            addBefore( PipelineUtils.PACKET_DECODER, "decompress", new PacketDecompressor() );
-+            addBefore( PipelineUtils.PACKET_DECODER, "decompress", new PacketDecompressor(compressionThreshold) );
+-    public void setCompressionThreshold(int compressionThreshold)
+-    {
+-        PacketCompressor compressor = ch.pipeline().get( PacketCompressor.class );
+-        PacketDecompressor decompressor = ch.pipeline().get( PacketDecompressor.class );
+-        if ( compressionThreshold >= 0 )
+-        {
+-            if ( compressor == null )
+-            {
+-                addBefore( PipelineUtils.PACKET_ENCODER, "compress", compressor = new PacketCompressor() );
+-            }
+-            compressor.setThreshold( compressionThreshold );
+-
+-            if ( decompressor == null )
+-            {
+-                addBefore( PipelineUtils.PACKET_DECODER, "decompress", decompressor = new PacketDecompressor() );
+-            }
+-        } else
+-        {
+-            if ( compressor != null )
+-            {
+-                ch.pipeline().remove( "compress" );
+-            }
+-            if ( decompressor != null )
+-            {
+-                ch.pipeline().remove( "decompress" );
+-            }
++    public void setCompressionThreshold(int compressionThreshold) {
++        if (ch == null || ch.pipeline() == null) {
++            throw new IllegalStateException("Channel or pipeline is null");
          }
-         if ( compressionThreshold < 0 )
-         {
+-
++    
++        if (ch.pipeline().get(PacketCompressor.class) == null && compressionThreshold >= 0) {
++            addBefore(PipelineUtils.PACKET_ENCODER, "compress", new PacketCompressor());
++        }
++        if (compressionThreshold >= 0) {
++            ch.pipeline().get(PacketCompressor.class).setThreshold(compressionThreshold);
++        } else {
++            ch.pipeline().remove("compress");
++        }
++    
++        if (ch.pipeline().get(PacketDecompressor.class) == null && compressionThreshold >= 0) {
++            addBefore(PipelineUtils.PACKET_DECODER, "decompress", new PacketDecompressor(compressionThreshold));
++        }
++        if (compressionThreshold < 0) {
++            ch.pipeline().remove("decompress");
++        }
++    
+         // disable use of composite buffers if we use natives
+         updateComposite();
+     }
 -- 
-2.47.1
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0024-Improve-ServerKickEvent.patch b/BungeeCord-Patches/0024-Improve-ServerKickEvent.patch
index 3a4b2ff2..a1e7f260 100644
--- a/BungeeCord-Patches/0024-Improve-ServerKickEvent.patch
+++ b/BungeeCord-Patches/0024-Improve-ServerKickEvent.patch
@@ -1,4 +1,4 @@
-From 1c384f08c5a31d8a3b5b38bf87ac23c6066cffc5 Mon Sep 17 00:00:00 2001
+From 81b9f18d1a8af187f61389f11c666d59c4575eb1 Mon Sep 17 00:00:00 2001
 From: Nathan Poirier <nathan@poirier.io>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent
@@ -81,10 +81,10 @@ index 6f49765f..661c6563 100644
          {
              // Pre cancel the event if we are going to try another server
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 1c075a9f..c567d549 100644
+index 3c286239..7bac16e6 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -645,10 +645,14 @@ public class DownstreamBridge extends PacketHandler
+@@ -648,10 +648,14 @@ public class DownstreamBridge extends PacketHandler
      public void handle(Kick kick) throws Exception
      {
          ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@@ -101,5 +101,5 @@ index 1c075a9f..c567d549 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.patch b/BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.patch
index 34737c57..663e8116 100644
--- a/BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.patch
+++ b/BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.patch
@@ -1,4 +1,4 @@
-From 92107dac4cc9aca1290d127e86fbf240a959d493 Mon Sep 17 00:00:00 2001
+From 1808a3b9132bd74f1065ea406af6534d1b764b3c Mon Sep 17 00:00:00 2001
 From: Aaron Hill <aa1ronham@gmail.com>
 Date: Thu, 15 Sep 2016 22:38:37 +0200
 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@@ -117,7 +117,7 @@ index 00000000..7ed2dc3a
 +    }
 +}
 diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-index 36582d85..df160672 100644
+index bf45501a..05116ba0 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -1,7 +1,9 @@
@@ -142,10 +142,10 @@ index 36582d85..df160672 100644
      @Setter
      private String lastCommandTabbed;
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index c567d549..a9258264 100644
+index 7bac16e6..9a12f002 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -750,6 +750,32 @@ public class DownstreamBridge extends PacketHandler
+@@ -753,6 +753,32 @@ public class DownstreamBridge extends PacketHandler
          }
      }
  
@@ -216,5 +216,5 @@ index d15044f4..bea2bbff 100644
       * Sends the server mod list to the client, or stores it for sending later.
       *
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0037-Add-console-command-completion.patch b/BungeeCord-Patches/0037-Add-console-command-completion.patch
index 9a78e8aa..506b8f82 100644
--- a/BungeeCord-Patches/0037-Add-console-command-completion.patch
+++ b/BungeeCord-Patches/0037-Add-console-command-completion.patch
@@ -1,4 +1,4 @@
-From 901eb492361fe718242f5b038f80c06a7f1b01b2 Mon Sep 17 00:00:00 2001
+From 4da99e78b8503947585d74438cc742ee7c2aabde Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 26 Sep 2017 18:59:37 +0200
 Subject: [PATCH] Add console command completion
@@ -7,10 +7,10 @@ Register command completer for JLine to complete command names and
 command arguments (if supported).
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-index a8b21559..c11ce8d3 100644
+index b159456f..b952e232 100644
 --- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
 +++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-@@ -221,6 +221,41 @@ public final class PluginManager
+@@ -256,6 +256,41 @@ public final class PluginManager
          return true;
      }
  
@@ -102,5 +102,5 @@ index 765d24bc..6cec0b5a 100644
      }
  
 -- 
-2.44.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0038-Providing-access-to-the-player-s-LoginResult-on-Logi.patch b/BungeeCord-Patches/0038-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
index a19caf98..1ae42ba0 100644
--- a/BungeeCord-Patches/0038-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
+++ b/BungeeCord-Patches/0038-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
@@ -1,25 +1,25 @@
-From d45c224f7f456f0df39e9dea42d026fed59fcd77 Mon Sep 17 00:00:00 2001
+From 294c62a91bf14df5857d5bd66aaaf1c98f1eb5dc Mon Sep 17 00:00:00 2001
 From: phenomax <phenomax@revayd.net>
 Date: Thu, 10 Aug 2017 18:41:17 +0200
 Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
 
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java b/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
-index 4c09efff..46517e03 100644
+index 4c09efff..96164522 100644
 --- a/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
 +++ b/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
 @@ -8,6 +8,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
  import net.md_5.bungee.api.chat.TextComponent;
  import net.md_5.bungee.api.connection.PendingConnection;
  import net.md_5.bungee.api.plugin.Cancellable;
-+import net.md_5.bungee.connection.LoginResult; // Waterfall: Parse LoginResult object to new constructor of LoginEvent
++import net.md_5.bungee.connection.LoginResult;
  
  /**
   * Event called to represent a player logging in.
-@@ -26,6 +27,13 @@ public class LoginEvent extends AsyncEvent<LoginEvent> implements Cancellable
-      * Message to use when kicking if this event is canceled.
+@@ -30,12 +31,28 @@ public class LoginEvent extends AsyncEvent<LoginEvent> implements Cancellable
+      * Connection attempting to login.
       */
-     private BaseComponent reason;
+     private final PendingConnection connection;
 +    // Waterfall start - adding the LoginResult variable to provide access to it, when calling the login event
 +    /**
 +     * The player's login result containing his textures
@@ -27,13 +27,13 @@ index 4c09efff..46517e03 100644
 +    private LoginResult loginResult;
 +    // Waterfall end
 +
-     /**
-      * Connection attempting to login.
-      */
-@@ -37,6 +45,15 @@ public class LoginEvent extends AsyncEvent<LoginEvent> implements Cancellable
+ 
+     public LoginEvent(PendingConnection connection, Callback<LoginEvent> done)
+     {
+         super( done );
          this.connection = connection;
      }
- 
++ 
 +    // Waterfall start - adding new constructor for LoginResult
 +    public LoginEvent(PendingConnection connection, Callback<LoginEvent> done, LoginResult loginResult)
 +    {
@@ -42,27 +42,30 @@ index 4c09efff..46517e03 100644
 +        this.loginResult = loginResult;
 +    }
 +    // Waterfall end
-+
+ 
      /**
       * @return reason to be displayed
-      * @deprecated use component methods instead
-diff --git a/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java b/api/src/main/java/net/md_5/bungee/connection/LoginResult.java
-similarity index 100%
-rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
-rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
-diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index deb9fef3..05261ccf 100644
---- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -653,7 +653,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
-         };
- 
-         // fire login event
--        bungee.getPluginManager().callEvent( new LoginEvent( InitialHandler.this, complete ) );
-+        bungee.getPluginManager().callEvent( new LoginEvent( InitialHandler.this, complete, this.getLoginProfile() ) ); // Waterfall: Parse LoginResult object to new constructor of LoginEvent
-     }
- 
-     private void finish2()
+diff --git a/api/src/main/java/net/md_5/bungee/connection/LoginResult.java b/api/src/main/java/net/md_5/bungee/connection/LoginResult.java
+new file mode 100644
+index 00000000..5dc8a220
+--- /dev/null
++++ b/api/src/main/java/net/md_5/bungee/connection/LoginResult.java
+@@ -0,0 +1,15 @@
++package net.md_5.bungee.connection;
++
++import lombok.AllArgsConstructor;
++import lombok.Data;
++import net.md_5.bungee.protocol.Property;
++
++@Data
++@AllArgsConstructor
++public class LoginResult
++{
++
++    private String id;
++    private String name;
++    private Property[] properties;
++}
 -- 
-2.44.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch b/BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch
index 4639deeb..0683ca61 100644
--- a/BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch
+++ b/BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch
@@ -1,17 +1,18 @@
-From 396b6aec9b76caa9d06636bbd8b15f23ba03449a Mon Sep 17 00:00:00 2001
+From 83c951a7406d3b0e78aa6fda496a017da7f049d5 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Thu, 8 Feb 2018 19:10:52 +0100
 Subject: [PATCH] Optionally log InitialHandler connections
 
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index 6141128b..e0baca9c 100644
+index 6141128b..10f459ae 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -214,6 +214,13 @@ public interface ProxyConfig
+@@ -213,6 +213,14 @@ public interface ProxyConfig
+     //
      // Waterfall Options
      //
- 
++ 
 +    /**
 +     * Whether we log InitialHandler connections
 +     *
@@ -19,14 +20,14 @@ index 6141128b..e0baca9c 100644
 +     */
 +    boolean isLogInitialHandlerConnections();
 +
+ 
      /**
       * The supported versions
-      *
 diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-index ef44d334..4ff8da6d 100644
+index ef44d334..ea424f03 100644
 --- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
 +++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-@@ -9,6 +9,13 @@ import java.io.File;
+@@ -9,6 +9,14 @@ import java.io.File;
  
  public class WaterfallConfiguration extends Configuration {
  
@@ -36,11 +37,12 @@ index ef44d334..4ff8da6d 100644
 +     * Default is true
 +     */
 +    private boolean logInitialHandlerConnections = true;
++    
 +
      /**
       * The supported versions displayed to the client
       * <p>Default is a comma separated list of supported versions. For example 1.8.x, 1.9.x, 1.10.x</p>
-@@ -40,6 +47,7 @@ public class WaterfallConfiguration extends Configuration {
+@@ -40,12 +48,18 @@ public class WaterfallConfiguration extends Configuration {
          super.load();
          YamlConfig config = new YamlConfig(new File("waterfall.yml"));
          config.load(false); // Load, but no permissions
@@ -48,23 +50,22 @@ index ef44d334..4ff8da6d 100644
          gameVersion = config.getString("game_version", "").isEmpty() ? Joiner.on(", ").join(ProtocolConstants.SUPPORTED_VERSIONS) : config.getString("game_version", "");
          useNettyDnsResolver = config.getBoolean("use_netty_dns_resolver", useNettyDnsResolver);
          // Throttling options
-@@ -47,6 +55,11 @@ public class WaterfallConfiguration extends Configuration {
+         tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
          disableModernTabLimiter = config.getBoolean("disable_modern_tab_limiter", disableModernTabLimiter);
      }
- 
++ 
 +    @Override
 +    public boolean isLogInitialHandlerConnections() {
 +        return logInitialHandlerConnections;
 +    }
-+
+ 
      @Override
      public String getGameVersion() {
-         return gameVersion;
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 1a6b7ae3..d6872035 100644
+index b8b7102c..d9ceb913 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -396,7 +396,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -392,7 +392,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
              case 3:
                  transferred = handshake.getRequestedProtocol() == 3;
                  // Login
@@ -76,6 +77,36 @@ index 1a6b7ae3..d6872035 100644
                  thisState = State.USERNAME;
                  ch.setProtocol( Protocol.LOGIN );
  
+@@ -631,7 +634,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+         };
+ 
+         // fire login event
+-        bungee.getPluginManager().callEvent( new LoginEvent( InitialHandler.this, eventLoopCallback( complete ) ) );
++        bungee.getPluginManager().callEvent( new LoginEvent( InitialHandler.this, complete, this.getLoginProfile() ) ); // Waterfall: Parse LoginResult object to new constructor of LoginEvent
+     }
+ 
+     private void finish2()
+diff --git a/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java b/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
+deleted file mode 100644
+index 5dc8a220..00000000
+--- a/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
++++ /dev/null
+@@ -1,15 +0,0 @@
+-package net.md_5.bungee.connection;
+-
+-import lombok.AllArgsConstructor;
+-import lombok.Data;
+-import net.md_5.bungee.protocol.Property;
+-
+-@Data
+-@AllArgsConstructor
+-public class LoginResult
+-{
+-
+-    private String id;
+-    private String name;
+-    private Property[] properties;
+-}
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0043-Provide-an-option-to-disable-entity-metadata-rewriti.patch b/BungeeCord-Patches/0043-Provide-an-option-to-disable-entity-metadata-rewriti.patch
index 8966cc00..99e31c3d 100644
--- a/BungeeCord-Patches/0043-Provide-an-option-to-disable-entity-metadata-rewriti.patch
+++ b/BungeeCord-Patches/0043-Provide-an-option-to-disable-entity-metadata-rewriti.patch
@@ -1,4 +1,4 @@
-From e9d1882ff4461d7b04050b9d356aa7c4e40faf69 Mon Sep 17 00:00:00 2001
+From ed44b81690331de23ef08b4543af31444fdfe714 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 14 Jan 2019 03:35:21 +0000
 Subject: [PATCH] Provide an option to disable entity metadata rewriting
@@ -12,10 +12,10 @@ may also create various issues with mods which do not support this,
 hence why the configuration option is provided
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index e0baca9c..f3bced0a 100644
+index 10f459ae..d2355188 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -252,4 +252,9 @@ public interface ProxyConfig
+@@ -253,4 +253,9 @@ public interface ProxyConfig
       * @return should we disable the tab completion limit for 1.13+ clients
       */
      boolean isDisableModernTabLimiter();
@@ -26,10 +26,10 @@ index e0baca9c..f3bced0a 100644
 +    boolean isDisableEntityMetadataRewrite();
  }
 diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-index 4ff8da6d..e860214f 100644
+index ea424f03..cc2bffa7 100644
 --- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
 +++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-@@ -42,6 +42,8 @@ public class WaterfallConfiguration extends Configuration {
+@@ -43,6 +43,8 @@ public class WaterfallConfiguration extends Configuration {
      private int tabThrottle = 1000;
      private boolean disableModernTabLimiter = true;
  
@@ -38,15 +38,15 @@ index 4ff8da6d..e860214f 100644
      @Override
      public void load() {
          super.load();
-@@ -53,6 +55,7 @@ public class WaterfallConfiguration extends Configuration {
+@@ -54,6 +56,7 @@ public class WaterfallConfiguration extends Configuration {
          // Throttling options
          tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
          disableModernTabLimiter = config.getBoolean("disable_modern_tab_limiter", disableModernTabLimiter);
 +        disableEntityMetadataRewrite = config.getBoolean("disable_entity_metadata_rewrite", disableEntityMetadataRewrite);
      }
- 
+  
      @Override
-@@ -79,4 +82,9 @@ public class WaterfallConfiguration extends Configuration {
+@@ -80,4 +83,9 @@ public class WaterfallConfiguration extends Configuration {
      public boolean isDisableModernTabLimiter() {
          return disableModernTabLimiter;
      }
@@ -137,10 +137,10 @@ index 05116ba0..dd215795 100644
 +    // Waterfall end
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index a9258264..da3db022 100644
+index 9a12f002..7a24bacd 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -754,6 +754,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -757,6 +757,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(net.md_5.bungee.protocol.packet.EntityEffect entityEffect) throws Exception
      {
@@ -148,7 +148,7 @@ index a9258264..da3db022 100644
          // Don't send any potions when switching between servers (which involves a handshake), which can trigger a race
          // condition on the client.
          if (this.con.getForgeClientHandler().isForgeUser() && !this.con.getForgeClientHandler().isHandshakeComplete()) {
-@@ -765,6 +766,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -768,6 +769,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception
      {
@@ -157,7 +157,7 @@ index a9258264..da3db022 100644
      }
  
 diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-index fab7e9b9..84a090b9 100644
+index 1bf73fd2..243acba6 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 @@ -27,6 +27,11 @@ public abstract class EntityMap
@@ -172,7 +172,7 @@ index fab7e9b9..84a090b9 100644
          switch ( version )
          {
              case ProtocolConstants.MINECRAFT_1_8:
-@@ -309,7 +314,13 @@ public abstract class EntityMap
+@@ -311,7 +316,13 @@ public abstract class EntityMap
                      DefinedPacket.readVarInt( packet );
                      break;
                  default:
@@ -225,5 +225,5 @@ index 00000000..cb81d1dd
 +// Waterfall end
 \ No newline at end of file
 -- 
-2.47.1
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0044-Add-ProxyDefineCommandsEvent.patch b/BungeeCord-Patches/0044-Add-ProxyDefineCommandsEvent.patch
index d14224b9..5d75f1d7 100644
--- a/BungeeCord-Patches/0044-Add-ProxyDefineCommandsEvent.patch
+++ b/BungeeCord-Patches/0044-Add-ProxyDefineCommandsEvent.patch
@@ -1,4 +1,4 @@
-From b93ab3b66e55042fa4965d287eb4bec71d2532dc Mon Sep 17 00:00:00 2001
+From 5fe51e09caaab038694c8fea42c0529858efa5db Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 14 Mar 2019 07:44:06 +0000
 Subject: [PATCH] Add ProxyDefineCommandsEvent
@@ -54,10 +54,10 @@ index 00000000..1fd4fc90
 +
 +}
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index da3db022..7b9c9268 100644
+index 7a24bacd..8152e638 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -789,9 +789,25 @@ public class DownstreamBridge extends PacketHandler
+@@ -792,9 +792,25 @@ public class DownstreamBridge extends PacketHandler
      {
          boolean modified = false;
  
@@ -86,5 +86,5 @@ index da3db022..7b9c9268 100644
                  CommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() ).executes( DUMMY_COMMAND )
                          .then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch b/BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch
index c70e7e36..00ff9bff 100644
--- a/BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch
+++ b/BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch
@@ -1,4 +1,4 @@
-From 4ee0d7b23287f5d557f54cb1072fc3ab9f931182 Mon Sep 17 00:00:00 2001
+From 06fcfb4635fef5340749e00571bf7e1949bf77bf Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 25 Nov 2019 19:54:06 +0000
 Subject: [PATCH] Speed up some common exceptions
@@ -59,10 +59,10 @@ index 6c0ef4df..076ddd70 100644
 +    // Waterfall end
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-index 6cd9e6a4..dffd3b7a 100644
+index 58e261b7..41cc5a2f 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-@@ -47,6 +47,9 @@ public abstract class DefinedPacket
+@@ -48,6 +48,9 @@ public abstract class DefinedPacket
          }
      }
  
@@ -72,7 +72,7 @@ index 6cd9e6a4..dffd3b7a 100644
      public static void writeString(String s, ByteBuf buf)
      {
          writeString( s, buf, Short.MAX_VALUE );
-@@ -242,13 +245,18 @@ public abstract class DefinedPacket
+@@ -252,13 +255,18 @@ public abstract class DefinedPacket
          byte in;
          while ( true )
          {
@@ -172,10 +172,10 @@ index 237955ab..d0bd4d75 100644
 +    // Waterfall end
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index d6872035..a7241527 100644
+index d9ceb913..d471cc69 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -23,6 +23,8 @@ import javax.crypto.SecretKey;
+@@ -24,6 +24,8 @@ import javax.crypto.SecretKey;
  import lombok.AllArgsConstructor;
  import lombok.Data;
  import lombok.EqualsAndHashCode;
@@ -184,7 +184,7 @@ index d6872035..a7241527 100644
  import lombok.Getter;
  import lombok.RequiredArgsConstructor;
  import lombok.ToString;
-@@ -518,6 +520,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -510,6 +512,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
  
          SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
@@ -221,5 +221,5 @@ index ac99d02c..0c1ecfb8 100644
  
              // Waterfall start
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0049-Add-exception-reporting-event.patch b/BungeeCord-Patches/0049-Add-exception-reporting-event.patch
index 6920c59e..ea88642f 100644
--- a/BungeeCord-Patches/0049-Add-exception-reporting-event.patch
+++ b/BungeeCord-Patches/0049-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 21306c26f7c8a4074c9a3d5fbe1991a1d00efb52 Mon Sep 17 00:00:00 2001
+From 57f3b82d452cdbc4ae141d2cbc265698372714cd Mon Sep 17 00:00:00 2001
 From: theminecoder <theminecoder.dev@gmail.com>
 Date: Wed, 22 Apr 2020 14:00:44 +1000
 Subject: [PATCH] Add exception reporting event
@@ -446,10 +446,10 @@ index 00000000..5bf57ec1
 +    }
 +}
 diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-index c11ce8d3..1ba5b249 100644
+index b952e232..d25ab60f 100644
 --- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
 +++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-@@ -26,6 +26,11 @@ import java.util.Stack;
+@@ -30,6 +30,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  import java.util.jar.JarEntry;
  import java.util.jar.JarFile;
  import java.util.logging.Level;
@@ -461,7 +461,7 @@ index c11ce8d3..1ba5b249 100644
  import lombok.RequiredArgsConstructor;
  import net.md_5.bungee.api.ChatColor;
  import net.md_5.bungee.api.CommandSender;
-@@ -34,6 +39,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
+@@ -38,6 +43,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
  import net.md_5.bungee.event.EventBus;
  import net.md_5.bungee.event.EventHandler;
  import org.yaml.snakeyaml.LoaderOptions;
@@ -469,7 +469,7 @@ index c11ce8d3..1ba5b249 100644
  import org.yaml.snakeyaml.Yaml;
  import org.yaml.snakeyaml.constructor.Constructor;
  import org.yaml.snakeyaml.introspector.PropertyUtils;
-@@ -194,10 +200,9 @@ public final class PluginManager
+@@ -229,10 +235,9 @@ public final class PluginManager
          }
  
          String[] args = Arrays.copyOfRange( split, 1, split.length );
@@ -481,7 +481,7 @@ index c11ce8d3..1ba5b249 100644
                  if ( proxy.getConfig().isLogCommands() )
                  {
                      proxy.getLogger().log( Level.INFO, "{0} executed command: /{1}", new Object[]
-@@ -206,18 +211,28 @@ public final class PluginManager
+@@ -241,18 +246,28 @@ public final class PluginManager
                      } );
                  }
                  command.execute( sender, args );
@@ -513,7 +513,7 @@ index c11ce8d3..1ba5b249 100644
          return true;
      }
  
-@@ -305,7 +320,11 @@ public final class PluginManager
+@@ -340,7 +355,11 @@ public final class PluginManager
                  } );
              } catch ( Throwable t )
              {
@@ -526,7 +526,7 @@ index c11ce8d3..1ba5b249 100644
              }
          }
      }
-@@ -445,7 +464,7 @@ public final class PluginManager
+@@ -480,7 +499,7 @@ public final class PluginManager
          Preconditions.checkNotNull( event, "event" );
  
          long start = System.nanoTime();
@@ -535,7 +535,7 @@ index c11ce8d3..1ba5b249 100644
          event.postCall();
  
          long elapsed = System.nanoTime() - start;
-@@ -459,6 +478,14 @@ public final class PluginManager
+@@ -494,6 +513,14 @@ public final class PluginManager
          return event;
      }
  
@@ -642,7 +642,7 @@ index 014de202..40792a68 100644
  
      @EventHandler
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index f25ff75a..b4e101ac 100644
+index 40d97b3f..aa58900e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -10,6 +10,8 @@ import com.google.gson.Gson;
@@ -695,5 +695,5 @@ index 38b75b51..02ec98fc 100644
  
              // If we have a period of 0 or less, only run once
 -- 
-2.44.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0050-Allow-to-disable-tablist-rewrite.patch b/BungeeCord-Patches/0050-Allow-to-disable-tablist-rewrite.patch
index 09ff0c47..39f2956d 100644
--- a/BungeeCord-Patches/0050-Allow-to-disable-tablist-rewrite.patch
+++ b/BungeeCord-Patches/0050-Allow-to-disable-tablist-rewrite.patch
@@ -1,14 +1,14 @@
-From 10d6d10e393b7642c67a334d1da7279c8f8e9275 Mon Sep 17 00:00:00 2001
+From 4e90f0663b9e5e3b03dfc065d4a45b5735dc7513 Mon Sep 17 00:00:00 2001
 From: xDark <aleshkailyashevich@gmail.com>
 Date: Fri, 31 May 2019 08:11:31 +0300
 Subject: [PATCH] Allow to disable tablist rewrite
 
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index 4a198ee9..d69463f0 100644
+index 1071e49c..2c97387a 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -255,4 +255,10 @@ public interface ProxyConfig
+@@ -256,4 +256,10 @@ public interface ProxyConfig
       * @return Should we disable entity metadata rewriting?
       */
      boolean isDisableEntityMetadataRewrite();
@@ -20,10 +20,10 @@ index 4a198ee9..d69463f0 100644
 +    boolean isDisableTabListRewrite();
  }
 diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-index e860214f..b88e3c8a 100644
+index cc2bffa7..62e38e6d 100644
 --- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
 +++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-@@ -43,6 +43,7 @@ public class WaterfallConfiguration extends Configuration {
+@@ -44,6 +44,7 @@ public class WaterfallConfiguration extends Configuration {
      private boolean disableModernTabLimiter = true;
  
      private boolean disableEntityMetadataRewrite = false;
@@ -31,15 +31,15 @@ index e860214f..b88e3c8a 100644
  
      @Override
      public void load() {
-@@ -56,6 +57,7 @@ public class WaterfallConfiguration extends Configuration {
+@@ -57,6 +58,7 @@ public class WaterfallConfiguration extends Configuration {
          tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
          disableModernTabLimiter = config.getBoolean("disable_modern_tab_limiter", disableModernTabLimiter);
          disableEntityMetadataRewrite = config.getBoolean("disable_entity_metadata_rewrite", disableEntityMetadataRewrite);
 +        disableTabListRewrite = config.getBoolean("disable_tab_list_rewrite", disableTabListRewrite);
      }
- 
+  
      @Override
-@@ -87,4 +89,9 @@ public class WaterfallConfiguration extends Configuration {
+@@ -88,4 +90,9 @@ public class WaterfallConfiguration extends Configuration {
      public boolean isDisableEntityMetadataRewrite() {
          return disableEntityMetadataRewrite;
      }
@@ -50,7 +50,7 @@ index e860214f..b88e3c8a 100644
 +    }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 7b9c9268..96655cb7 100644
+index 8152e638..1596b1eb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 @@ -171,8 +171,14 @@ public class DownstreamBridge extends PacketHandler
@@ -71,5 +71,5 @@ index 7b9c9268..96655cb7 100644
  
      @Override
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0051-Remove-version-from-brand-info.patch b/BungeeCord-Patches/0051-Remove-version-from-brand-info.patch
index 3df2c3a9..53b55659 100644
--- a/BungeeCord-Patches/0051-Remove-version-from-brand-info.patch
+++ b/BungeeCord-Patches/0051-Remove-version-from-brand-info.patch
@@ -1,14 +1,14 @@
-From 874f2333b281a17a07efe555d3799f50ce46acbb Mon Sep 17 00:00:00 2001
+From 9688b6af7d10c7f96bdedb1938790501b00c3891 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 20 Jun 2020 18:21:17 +0100
 Subject: [PATCH] Remove version from brand info
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 96655cb7..213c130f 100644
+index 1596b1eb..399b4e7d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -329,7 +329,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -332,7 +332,7 @@ public class DownstreamBridge extends PacketHandler
              Preconditions.checkState( !serverBrand.contains( bungee.getName() ), "Cannot connect proxy to itself!" );
  
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
@@ -18,5 +18,5 @@ index 96655cb7..213c130f 100644
              brand.release();
              // changes in the packet are ignored so we need to send it manually
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0052-Add-auth-url-option.patch b/BungeeCord-Patches/0052-Add-auth-url-option.patch
index 93665afe..89dd348e 100644
--- a/BungeeCord-Patches/0052-Add-auth-url-option.patch
+++ b/BungeeCord-Patches/0052-Add-auth-url-option.patch
@@ -1,14 +1,14 @@
-From af32bdf15c26fbc215936d4011604fd435b8e23b Mon Sep 17 00:00:00 2001
+From e585417e5090f80bf89f625fc498582d4e960659 Mon Sep 17 00:00:00 2001
 From: theminecoder <theminecoder.dev@gmail.com>
 Date: Sun, 19 Jul 2020 10:18:23 +1000
 Subject: [PATCH] Add auth url option
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index a7241527..e3a1f744 100644
+index d471cc69..d5ace436 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -87,6 +87,8 @@ import net.md_5.bungee.util.QuietException;
+@@ -88,6 +88,8 @@ import net.md_5.bungee.util.QuietException;
  public class InitialHandler extends PacketHandler implements PendingConnection
  {
  
@@ -17,7 +17,7 @@ index a7241527..e3a1f744 100644
      private final BungeeCord bungee;
      private ChannelWrapper ch;
      @Getter
-@@ -548,7 +550,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -540,7 +542,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" );
  
          String preventProxy = ( BungeeCord.getInstance().config.isPreventProxyConnections() && getSocketAddress() instanceof InetSocketAddress ) ? "&ip=" + URLEncoder.encode( getAddress().getAddress().getHostAddress(), "UTF-8" ) : "";
@@ -27,5 +27,5 @@ index a7241527..e3a1f744 100644
          Callback<String> handler = new Callback<String>()
          {
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0054-Additional-DoS-mitigations.patch b/BungeeCord-Patches/0054-Additional-DoS-mitigations.patch
index 8768fa20..10be53e2 100644
--- a/BungeeCord-Patches/0054-Additional-DoS-mitigations.patch
+++ b/BungeeCord-Patches/0054-Additional-DoS-mitigations.patch
@@ -1,4 +1,4 @@
-From 9510b1e224526e367d4b2dd77856336a5ed75493 Mon Sep 17 00:00:00 2001
+From fe17f789098e98b31836b35a22ab21a390ff27a4 Mon Sep 17 00:00:00 2001
 From: "Five (Xer)" <admin@fivepb.me>
 Date: Sat, 30 Jan 2021 18:04:14 +0100
 Subject: [PATCH] Additional DoS mitigations
@@ -8,10 +8,10 @@ Courtesy of Tux and the Velocity Contributors. See:
 https://github.com/VelocityPowered/Velocity/commit/5ceac16a821ea35572ff11412ace8929fd06e278
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-index dffd3b7a..dafaba54 100644
+index 41cc5a2f..89ceb33f 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-@@ -82,6 +82,7 @@ public abstract class DefinedPacket
+@@ -92,6 +92,7 @@ public abstract class DefinedPacket
          int len = readVarInt( buf );
          if ( len > maxLen * 3 )
          {
@@ -19,7 +19,7 @@ index dffd3b7a..dafaba54 100644
              throw new OverflowPacketException( "Cannot receive string longer than " + maxLen * 3 + " (got " + len + " bytes)" );
          }
  
-@@ -90,6 +91,7 @@ public abstract class DefinedPacket
+@@ -100,6 +101,7 @@ public abstract class DefinedPacket
  
          if ( s.length() > maxLen )
          {
@@ -27,7 +27,7 @@ index dffd3b7a..dafaba54 100644
              throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" );
          }
  
-@@ -567,4 +569,21 @@ public abstract class DefinedPacket
+@@ -577,4 +579,21 @@ public abstract class DefinedPacket
  
      @Override
      public abstract String toString();
@@ -167,10 +167,10 @@ index 52f76cd9..3a4a735c 100644
 +    // Waterfall end
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
-index 63e9d18d..545eec72 100644
+index 1b911699..8244154d 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
-@@ -63,4 +63,17 @@ public class EncryptionResponse extends DefinedPacket
+@@ -67,4 +67,17 @@ public class EncryptionResponse extends DefinedPacket
          private final long salt;
          private final byte[] signature;
      }
@@ -257,5 +257,5 @@ index 738f0c92..ec33d337 100644
 +    // Waterfall end
  }
 -- 
-2.44.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0056-Configurable-plugin-messaging-limits.patch b/BungeeCord-Patches/0056-Configurable-plugin-messaging-limits.patch
index 9abaf17a..11ae4a2e 100644
--- a/BungeeCord-Patches/0056-Configurable-plugin-messaging-limits.patch
+++ b/BungeeCord-Patches/0056-Configurable-plugin-messaging-limits.patch
@@ -1,4 +1,4 @@
-From cff6ef34d7eb83a4762d29e230b530e70616e1e1 Mon Sep 17 00:00:00 2001
+From a108d93b411d985ce9cc6ebb9e046c7aab5e10e3 Mon Sep 17 00:00:00 2001
 From: FivePB <admin@fivepb.me>
 Date: Tue, 16 Nov 2021 21:15:32 +0100
 Subject: [PATCH] Configurable plugin messaging limits
@@ -8,14 +8,14 @@ as their name length limit configurable. This is required for some modded
 servers and clients to work
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index d69463f0..469fe0e1 100644
+index 2c97387a..b11fd883 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -261,4 +261,18 @@ public interface ProxyConfig
+@@ -262,4 +262,18 @@ public interface ProxyConfig
       * @return {@code true} if tablist rewriting is disabled, {@code false} otherwise
       */
      boolean isDisableTabListRewrite();
-+
++    
 +    /**
 +     * Gets the maximum number of registered plugin channels for any connection.
 +     *
@@ -31,18 +31,19 @@ index d69463f0..469fe0e1 100644
 +    int getPluginChannelNameLimit();
  }
 diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-index b88e3c8a..da0efa36 100644
+index 62e38e6d..d097a164 100644
 --- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
 +++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
-@@ -45,6 +45,23 @@ public class WaterfallConfiguration extends Configuration {
+@@ -45,7 +45,24 @@ public class WaterfallConfiguration extends Configuration {
+ 
      private boolean disableEntityMetadataRewrite = false;
      private boolean disableTabListRewrite = true;
- 
++ 
 +    /*
-+     * Plugin Message limiting options
-+     * Allows for more control over server-client communication
-+     */
-+
++        * Plugin Message limiting options
++        * Allows for more control over server-client communication
++        */
+ 
 +    /**
 +     * How many channels there can be between server and player,
 +     * typically used by mods or some plugins.
@@ -54,24 +55,24 @@ index b88e3c8a..da0efa36 100644
 +     * only reason to change it would be broken mods.
 +     */
 +    private int pluginChannelNameLimit = 128;
-+
++    
      @Override
      public void load() {
          super.load();
-@@ -58,6 +75,8 @@ public class WaterfallConfiguration extends Configuration {
+@@ -59,6 +76,8 @@ public class WaterfallConfiguration extends Configuration {
          disableModernTabLimiter = config.getBoolean("disable_modern_tab_limiter", disableModernTabLimiter);
          disableEntityMetadataRewrite = config.getBoolean("disable_entity_metadata_rewrite", disableEntityMetadataRewrite);
          disableTabListRewrite = config.getBoolean("disable_tab_list_rewrite", disableTabListRewrite);
 +        pluginChannelLimit = config.getInt("registered_plugin_channels_limit", pluginChannelLimit);
 +        pluginChannelNameLimit = config.getInt("plugin_channel_name_limit", pluginChannelNameLimit);
      }
- 
+  
      @Override
-@@ -94,4 +113,14 @@ public class WaterfallConfiguration extends Configuration {
+@@ -95,4 +114,14 @@ public class WaterfallConfiguration extends Configuration {
      public boolean isDisableTabListRewrite() {
          return disableTabListRewrite;
      }
-+
++    
 +    @Override
 +    public int getPluginChannelLimit() {
 +        return pluginChannelLimit;
@@ -83,23 +84,22 @@ index b88e3c8a..da0efa36 100644
 +    }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index e3a1f744..bbaf947f 100644
+index d5ace436..1a981bb4 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -865,9 +865,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -840,8 +840,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
  
              for ( String id : content.split( "\0" ) )
              {
 -                Preconditions.checkState( registeredChannels.size() < 128, "Too many registered channels" );
 -                Preconditions.checkArgument( id.length() < 128, "Channel name too long" );
--
 +                // Waterfall start: Add configurable limits for plugin messaging
 +                Preconditions.checkState( !(registeredChannels.size() > bungee.getConfig().getPluginChannelLimit()), "Too many registered channels. This limit can be configured in the waterfall.yml" );
 +                Preconditions.checkArgument( !(id.length() > bungee.getConfig().getPluginChannelNameLimit()), "Channel name too long. This limit can be configured in the waterfall.yml" );
 +                // Waterfall end
+ 
                  registeredChannels.add( id );
              }
-         } else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0059-Improve-login-state-transition.patch b/BungeeCord-Patches/0059-Improve-login-state-transition.patch
index b68996b5..71407208 100644
--- a/BungeeCord-Patches/0059-Improve-login-state-transition.patch
+++ b/BungeeCord-Patches/0059-Improve-login-state-transition.patch
@@ -1,14 +1,14 @@
-From 9bc80c19893dd16e36b2e1fb67ceed4971a1a010 Mon Sep 17 00:00:00 2001
+From e299cb3fe364a3784d1baca882af0dbf117337fa Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 8 May 2022 12:04:30 +0100
 Subject: [PATCH] Improve login state transition
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index bbaf947f..37715ba9 100644
+index 1a981bb4..9c3bcd26 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -520,6 +520,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -512,6 +512,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      {
          Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
          Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
@@ -16,7 +16,7 @@ index bbaf947f..37715ba9 100644
  
          SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
          // Waterfall start
-@@ -576,7 +577,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -568,7 +569,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                  }
              }
          };
@@ -26,5 +26,5 @@ index bbaf947f..37715ba9 100644
      }
  
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0060-Add-protocol-version-to-packet-not-found-message.patch b/BungeeCord-Patches/0060-Add-protocol-version-to-packet-not-found-message.patch
index e2993b08..a7524159 100644
--- a/BungeeCord-Patches/0060-Add-protocol-version-to-packet-not-found-message.patch
+++ b/BungeeCord-Patches/0060-Add-protocol-version-to-packet-not-found-message.patch
@@ -1,4 +1,4 @@
-From 1f9e69b8ef64b3ecd7ac64ac61bef3486f6b9545 Mon Sep 17 00:00:00 2001
+From 7f8cb1136ab7ff93242ec773a16c9c0f95253afe Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 12 Jun 2022 06:45:54 +0100
 Subject: [PATCH] Add protocol version to packet not found message
@@ -6,7 +6,7 @@ Subject: [PATCH] Add protocol version to packet not found message
 Also avoids a double get, but, this is probably trivial
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-index 7a26c419..f84bfab8 100644
+index 34be8c00..b4b6f25e 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 @@ -2,6 +2,8 @@ package net.md_5.bungee.protocol;
@@ -18,7 +18,7 @@ index 7a26c419..f84bfab8 100644
  import gnu.trove.map.TIntObjectMap;
  import gnu.trove.map.TObjectIntMap;
  import gnu.trove.map.hash.TIntObjectHashMap;
-@@ -998,9 +1000,12 @@ public enum Protocol
+@@ -1028,9 +1030,12 @@ public enum Protocol
              {
                  throw new BadPacketException( "Unsupported protocol version" );
              }
@@ -34,5 +34,5 @@ index 7a26c419..f84bfab8 100644
      }
  }
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0062-Add-message-for-outdated-clients-that-don-t-support-.patch b/BungeeCord-Patches/0062-Add-message-for-outdated-clients-that-don-t-support-.patch
index 0f20ec68..ff1a4112 100644
--- a/BungeeCord-Patches/0062-Add-message-for-outdated-clients-that-don-t-support-.patch
+++ b/BungeeCord-Patches/0062-Add-message-for-outdated-clients-that-don-t-support-.patch
@@ -1,4 +1,4 @@
-From 793b803787b1644c63d7505f2eb89b729a2e3606 Mon Sep 17 00:00:00 2001
+From 15753ed8b9e037f6d6d74945b9d2c3cecf3f7edc Mon Sep 17 00:00:00 2001
 From: Aurora <aurora@relanet.eu>
 Date: Mon, 18 Jul 2022 15:56:05 +0200
 Subject: [PATCH] Add message for outdated clients that don't support secure
@@ -8,10 +8,10 @@ Clients before 1.19 don't support secure profiles, but since secure profiles is
 things checked those outdated clients didn't get a useful message telling them to update.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 37715ba9..31a7e109 100644
+index 9c3bcd26..168d07db 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -443,6 +443,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -439,6 +439,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
  
          if ( BungeeCord.getInstance().config.isEnforceSecureProfile() && getVersion() < ProtocolConstants.MINECRAFT_1_19_3 )
          {
@@ -32,5 +32,5 @@ index 149c742f..8d5075f6 100644
  error_occurred_player=\u00a7cAn error occurred while parsing your message. (Hover for details)
  error_occurred_console=\u00a7cAn error occurred while parsing your message: {0}
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0064-reduce-log-spam-from-clients-registeirng-too-many-ch.patch b/BungeeCord-Patches/0064-reduce-log-spam-from-clients-registeirng-too-many-ch.patch
index 93fa41c2..f29b5290 100644
--- a/BungeeCord-Patches/0064-reduce-log-spam-from-clients-registeirng-too-many-ch.patch
+++ b/BungeeCord-Patches/0064-reduce-log-spam-from-clients-registeirng-too-many-ch.patch
@@ -1,14 +1,14 @@
-From 1c5154b28e2e752d104ad4bf9a02043d0b8c22ee Mon Sep 17 00:00:00 2001
+From 75c1e2c1c0f0edcf47b1c85d68e796e3fbd5f7f0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 21 Apr 2023 15:32:33 +0100
 Subject: [PATCH] reduce log spam from clients registeirng too many channels
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 31a7e109..185e63ad 100644
+index 168d07db..af43ab13 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -194,7 +194,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -195,7 +195,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public void handle(PluginMessage pluginMessage) throws Exception
      {
@@ -28,5 +28,5 @@ index 31a7e109..185e63ad 100644
  
      @Override
 -- 
-2.47.0
+2.47.1.windows.2
 
diff --git a/BungeeCord-Patches/0065-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch b/BungeeCord-Patches/0065-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch
index 4c251456..3c2a2702 100644
--- a/BungeeCord-Patches/0065-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch
+++ b/BungeeCord-Patches/0065-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch
@@ -1,4 +1,4 @@
-From 7ca84aa25ab2893196de3618e12e381729564243 Mon Sep 17 00:00:00 2001
+From 9b76dcdccfef36ef5102def5f4db7052df79dde3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2023 00:36:38 +0100
 Subject: [PATCH] Prevent proxy commands from breaking the chat chain system
@@ -19,10 +19,10 @@ index e2221010..4dde7257 100644
      // Waterfall end
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-index f84bfab8..fb239f75 100644
+index b4b6f25e..dce064d7 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-@@ -586,6 +586,13 @@ public enum Protocol
+@@ -614,6 +614,13 @@ public enum Protocol
                      map( ProtocolConstants.MINECRAFT_1_20_5, 0x06 ),
                      map( ProtocolConstants.MINECRAFT_1_21_2, 0x07 )
              );
@@ -90,7 +90,7 @@ index 33c838f9..f259ee91 100644
 +    }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index e61fcc88..e7f1be2f 100644
+index ba0ef69d..3aa97849 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 @@ -198,16 +198,22 @@ public class UpstreamBridge extends PacketHandler
@@ -133,5 +133,5 @@ index e61fcc88..e7f1be2f 100644
          throw CancelSendSignal.INSTANCE;
      }
 -- 
-2.47.1
+2.47.1.windows.2