Updated Upstream (BungeeCord) (#858)

Co-authored-by: linsaftw <[email protected]>

Author: linsaftw

BungeeCord

@@ -1,4 +1,4 @@
-From 058ce1cb0fc175ecb9e9ac294d2146683a7036b1 Mon Sep 17 00:00:00 2001
+From e6b1fb10923e30ebe5c2530f7a0ee9705c8482d9 Mon Sep 17 00:00:00 2001
 From: Tux <[email protected]>
 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
 

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From ec9212b56121afd790778af8dc277c5bdf8d1832 Mon Sep 17 00:00:00 2001
+From 8b6edc385e31ebc6fb3ad2712c3108d28e345a0b Mon Sep 17 00:00:00 2001
 From: Tux <[email protected]>
 Date: Thu, 19 May 2016 11:28:45 -0700
 Subject: [PATCH] Rename references from BungeeCord to Waterfall
@@ -18,10 +18,10 @@ index f1ccd4f6..d703d6d2 100644
      }
 
 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 e7f3f09a..0bf89f1c 100644
+index c39239bc..37aeae0c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -192,7 +192,7 @@ public class BungeeCord extends ProxyServer
+@@ -208,7 +208,7 @@ public class BungeeCord extends ProxyServer
      public BungeeCord() throws IOException
      {
          // Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
@@ -30,7 +30,7 @@ index e7f3f09a..0bf89f1c 100644
 
          reloadMessages();
 
-@@ -541,7 +541,7 @@ public class BungeeCord extends ProxyServer
+@@ -557,7 +557,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getName()
      {
@@ -88,7 +88,7 @@ index efe048c9..720d0c3b 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-index de85f0b2..b9e99d6c 100644
+index d659a138..3f2c82b2 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 @@ -216,7 +216,7 @@ public class YamlConfig implements ConfigurationAdapter
@@ -101,5 +101,5 @@ index de85f0b2..b9e99d6c 100644
              SocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.43.0
+2.47.1.windows.2
 

BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch

@@ -1,4 +1,4 @@
-From 6ddae20ccb4b7b035ac3b24464671daa01a57056 Mon Sep 17 00:00:00 2001
+From 170b6d6aeb2eb69e636310e0f47c0025de82dac5 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Tue, 25 Oct 2016 11:58:37 -0400
 Subject: [PATCH] Add Waterfall configuration files
@@ -42,7 +42,7 @@ index 00000000..741ebfde
 +
 +}
 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 0bf89f1c..3aae1ea4 100644
+index 37aeae0c..98203cc8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -9,6 +9,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -53,7 +53,7 @@ index 0bf89f1c..3aae1ea4 100644
  import io.netty.bootstrap.ServerBootstrap;
  import io.netty.channel.Channel;
  import io.netty.channel.ChannelException;
-@@ -116,7 +117,7 @@ public class BungeeCord extends ProxyServer
+@@ -117,7 +118,7 @@ public class BungeeCord extends ProxyServer
       * Configuration.
       */
      @Getter
@@ -63,7 +63,7 @@ index 0bf89f1c..3aae1ea4 100644
       * Localization formats.
       */
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-index 54c3223c..54a6cb38 100644
+index 95320050..2c819684 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 @@ -24,7 +24,7 @@ import net.md_5.bungee.util.CaseInsensitiveSet;
@@ -76,7 +76,7 @@ index 54c3223c..54a6cb38 100644
 
      /**
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-index b9e99d6c..f6b5e8b8 100644
+index 3f2c82b2..1de9875c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 @@ -47,10 +47,15 @@ public class YamlConfig implements ConfigurationAdapter
@@ -118,5 +118,5 @@ index b9e99d6c..f6b5e8b8 100644
          if ( permissions == null )
          {
 -- 
-2.43.0
+2.47.1.windows.2
 

BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch

@@ -1,15 +1,15 @@
-From e79d3a76afb72b8aad4063923f0748177a4956ce Mon Sep 17 00:00:00 2001
+From aaaf0b95e6554567d0c7d033961e82b0f6783247 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <[email protected]>
 Date: Thu, 19 May 2016 10:55:20 -0700
 Subject: [PATCH] Disable Metrics
 
 MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;)
 
 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 3aae1ea4..a64d916a 100644
+index 98203cc8..7ad603af 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -127,7 +127,7 @@ public class BungeeCord extends ProxyServer
+@@ -128,7 +128,7 @@ public class BungeeCord extends ProxyServer
       * locations.yml save thread.
       */
      private final Timer saveThread = new Timer( "Reconnect Saver" );
@@ -18,7 +18,7 @@ index 3aae1ea4..a64d916a 100644
      /**
       * Server socket listener.
       */
-@@ -315,7 +315,7 @@ public class BungeeCord extends ProxyServer
+@@ -331,7 +331,7 @@ public class BungeeCord extends ProxyServer
                  }
              }
          }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@@ -27,7 +27,7 @@ index 3aae1ea4..a64d916a 100644
 
          Runtime.getRuntime().addShutdownHook( new Thread()
          {
-@@ -473,7 +473,7 @@ public class BungeeCord extends ProxyServer
+@@ -489,7 +489,7 @@ public class BungeeCord extends ProxyServer
              reconnectHandler.close();
          }
          saveThread.cancel();
@@ -177,5 +177,5 @@ index eabf7573..00000000
 -    }
 -}
 -- 
-2.43.0
+2.47.1.windows.2
 

BungeeCord-Patches/0005-Disable-Metrics.patch

@@ -1,14 +1,14 @@
-From 34fdda895db367f225f49d94a55a8f04aa89842f Mon Sep 17 00:00:00 2001
+From e6babfb5cf01befc88b60416cfcce8121cfa5c31 Mon Sep 17 00:00:00 2001
 From: Troy Frew <[email protected]>
 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
 

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,12 +1,12 @@
-From b212fd1b0a9b781f13e21b4c1e9c0432640baaf1 Mon Sep 17 00:00:00 2001
+From 2dc230ec020d7ca2631a74149e6aea7bb3ce0509 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Tue, 3 May 2016 20:31:52 -0700
 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..ad1704dd 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,19 +17,20 @@ 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,25 @@ public class PluginMessage extends DefinedPacket
              return "legacy:" + tag.toLowerCase( Locale.ROOT );
          }
      };
 -    //
 +
+     private String tag;
+     private byte[] data;
+ 
++    // Waterfall start
 +    public PluginMessage(String tag, ByteBuf data, boolean allowExtendedPacket) {
 +        this(tag, ByteBufUtil.getBytes(data), allowExtendedPacket);
 +    }
 +
-     private String tag;
-     private byte[] data;
- 
 +    public void setData(byte[] data) {
 +        this.data = Preconditions.checkNotNull(data, "Null data");
 +    }
@@ -38,15 +39,16 @@ index 70b292f0..91f71c09 100644
 +        Preconditions.checkNotNull(buf, "Null buffer");
 +        setData(ByteBufUtil.getBytes(buf));
 +    }
++    // Waterfall end
 +
      /**
       * Allow this packet to be sent as an "extended" packet.
       */
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index b58a01c6..c7637608 100644
+index 8f52c50e..33c2c8ab 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -286,7 +286,7 @@ public class ServerConnector extends PacketHandler
+@@ -287,7 +287,7 @@ public class ServerConnector extends PacketHandler
 
                  ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
                  DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@@ -56,10 +58,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 );
@@ -69,18 +71,18 @@ index d518d05f..21019091 100644
              // changes in the packet are ignored so we need to send it manually
              con.unsafe().sendPacket( pluginMessage );
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-index 2446f489..380b6012 100644
+index 2934cdef..91c1fbdb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-@@ -55,7 +55,7 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
+@@ -55,7 +55,7 @@ import net.md_5.bungee.util.PacketLimiter;
  public class PipelineUtils
  {
 
 -    public static final AttributeKey<ListenerInfo> LISTENER = AttributeKey.valueOf( "ListerInfo" );
 +    public static final AttributeKey<ListenerInfo> LISTENER = AttributeKey.newInstance( "ListerInfo" );
-     public static final ChannelInitializer<Channel> SERVER_CHILD = new ChannelInitializer<Channel>()
+ 
+     private static void setChannelInitializerHolders()
      {
-         @Override
 -- 
-2.47.0
+2.47.1.windows.2
 

BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch

@@ -1,4 +1,4 @@
-From 4ef93b430b7240ea845535477c4d3ac49f906088 Mon Sep 17 00:00:00 2001
+From 76d5811ff1c891c4f93863f8a78ed8c60312065b Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 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 a048d5a3..1e3aef58 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
 

BungeeCord-Patches/0010-Optimize-uuid-conversions.patch

@@ -1,4 +1,4 @@
-From 5dc2020c97ea49af439b9277813faed5aea6eb52 Mon Sep 17 00:00:00 2001
+From 5a018520e9c84869b359a016f654807df4ffdb1b Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <[email protected]>
 Date: Tue, 25 Oct 2016 12:23:07 -0400
 Subject: [PATCH] Add support for FML with IP Forwarding enabled
@@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw
 No breaking changes occur due to this patch.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index c60c7dd7..3bc72011 100644
+index 33c2c8ab..86b4b8ed 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufAllocator;
@@ -23,7 +23,7 @@ index c60c7dd7..3bc72011 100644
  import java.util.Queue;
  import java.util.Set;
  import java.util.UUID;
-@@ -115,15 +116,39 @@ public class ServerConnector extends PacketHandler
+@@ -116,15 +117,39 @@ public class ServerConnector extends PacketHandler
              String newHost = copiedHandshake.getHost() + "\00" + AddressUtil.sanitizeAddress( user.getAddress() ) + "\00" + user.getUUID();
 
              LoginResult profile = user.getPendingConnection().getLoginProfile();
@@ -67,10 +67,10 @@ index c60c7dd7..3bc72011 100644
          }
 
 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 9edec410..c8d5648c 100644
+index 6d661494..caf9ff72 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -173,9 +173,12 @@ public final class UserConnection implements ProxiedPlayer
+@@ -169,9 +169,12 @@ public final class UserConnection implements ProxiedPlayer
 
          forgeClientHandler = new ForgeClientHandler( this );
 
@@ -101,5 +101,5 @@ index 6dca2048..f5253b89 100644
       * The FML 1.8 handshake token.
       */
 -- 
-2.43.0.windows.1
+2.47.1.windows.2