Update Bungeecord

PaperMC · Dec 21, 2018 · 6b32122 · DoNotSpamPls · Dec 21, 2018 · 6b32122
1 parent bea8aac
commit 6b32122
Show file tree

Hide file tree

Showing 25 changed files with 199 additions and 272 deletions.
diff --git a/BungeeCord b/BungeeCord
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 44f61c24b033e3bc7fd167e5163f7b0eff51ee81 Mon Sep 17 00:00:00 2001
+From cd99027f638fc0db380f0635fd44471e9411fb62 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
@@ -67,7 +67,7 @@ index 5432a6eb..48bd8a54 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 615ac3f5..ee76507c 100644
+index b3bcb6c1..ba94c757 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,19 +4,19 @@
@@ -96,7 +96,7 @@ index 615ac3f5..ee76507c 100644
 
      <properties>
          <maven.deploy.skip>true</maven.deploy.skip>
-@@ -27,8 +27,8 @@
+@@ -27,15 +27,15 @@
 
      <dependencies>
          <dependency>
@@ -107,7 +107,6 @@ index 615ac3f5..ee76507c 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -41,7 +41,7 @@
      </dependencies>
 
      <build>
@@ -116,7 +115,7 @@ index 615ac3f5..ee76507c 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -50,7 +50,7 @@
+@@ -44,7 +44,7 @@
                  <configuration>
                      <archive>
                          <manifestEntries>
@@ -126,17 +125,14 @@ index 615ac3f5..ee76507c 100644
                              <Specification-Version>${maven.build.timestamp}</Specification-Version>
                          </manifestEntries>
 diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
-index b7cb81e2..a4516ed9 100644
+index 6be22739..a4516ed9 100644
 --- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
 +++ b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
-@@ -5,9 +5,9 @@ public class Bootstrap
-
-     public static void main(String[] args) throws Exception
+@@ -7,7 +7,7 @@ public class Bootstrap
      {
--        if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 51.0 )
-+        if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 52.0 )
+         if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 52.0 )
          {
--            System.err.println( "*** ERROR *** BungeeCord requires Java 7 or above to function! Please download and install it!" );
+-            System.err.println( "*** ERROR *** BungeeCord requires Java 8 or above to function! Please download and install it!" );
 +            System.err.println( "*** ERROR *** Waterfall requires Java 8 or above to function! Please download and install it!" );
              System.out.println( "You can check your Java version with the command: java -version" );
              return;
@@ -487,7 +483,7 @@ index 15c0ada2..7073b404 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 8587db46..5eab8750 100644
+index 4f8786a5..5eab8750 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -614,7 +610,7 @@ index 8587db46..5eab8750 100644
                  <configuration>
 -                    <signature>
 -                        <groupId>org.codehaus.mojo.signature</groupId>
--                        <artifactId>java17</artifactId>
+-                        <artifactId>java18</artifactId>
 -                        <version>1.0</version>
 -                    </signature>
 +                    <additionalparam>-Xdoclint:none</additionalparam>
@@ -672,10 +668,10 @@ index 8587db46..5eab8750 100644
 +    </profiles>
  </project>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index 34e38ff7..a635cb70 100644
+index ec0240a4..ee513895 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
-@@ -4,24 +4,24 @@
+@@ -4,19 +4,19 @@
      <modelVersion>4.0.0</modelVersion>
 
      <parent>
@@ -699,7 +695,11 @@ index 34e38ff7..a635cb70 100644
 +    <name>Waterfall-Protocol</name>
 +    <description>Minimal implementation of the Minecraft protocol for use in Waterfall</description>
 
-     <dependencies>
+     <!-- We really shouldn't depend on external repositories, but at least this is the Central staging one -->
+     <repositories>
+@@ -41,8 +41,8 @@
+             <scope>compile</scope>
+         </dependency>
          <dependency>
 -            <groupId>net.md-5</groupId>
 -            <artifactId>bungeecord-chat</artifactId>
@@ -709,7 +709,7 @@ index 34e38ff7..a635cb70 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 2db37850..f4eae4e3 100644
+index af3536bc..879a82d7 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -821,5 +821,5 @@ index fdd44b20..4ae682ee 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.20.0
+2.20.1
 
diff --git a/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch b/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch
@@ -1,14 +1,14 @@
-From 7722688cbcf4e88c94f858e0e98975d6188637f6 Mon Sep 17 00:00:00 2001
+From 3692953ec62a6a392c46c1bea06cc8eea0b28644 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 18 Jul 2018 20:23:03 +0300
 Subject: [PATCH] Copy license files into jar
 
 
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 00eb9c5c..841f014e 100644
+index 879a82d7..03e35f42 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
-@@ -98,6 +98,20 @@
+@@ -104,6 +104,20 @@
                  <directory>src/main/resources</directory>
                  <filtering>true</filtering>
              </resource>
@@ -30,5 +30,5 @@ index 00eb9c5c..841f014e 100644
      </build>
  </project>
 -- 
-2.18.0
+2.20.1
 
diff --git a/BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch b/BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch
@@ -1,31 +1,9 @@
-From 07f1a21a2ec62989967c0f86c1cd5c63f9f9ade3 Mon Sep 17 00:00:00 2001
+From a3d08e67c922ca102c733d7f6f26530d9b2dbb03 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 11:28:45 -0700
 Subject: [PATCH] Rename references from BungeeCord to Waterfall
 
 
-diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index b6b2ceef..11526c9c 100644
---- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-+++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-@@ -43,7 +43,7 @@ public class BungeeCordLauncher
-             if ( buildDate.before( deadline.getTime() ) )
-             {
-                 System.err.println( "*** Warning, this build is outdated ***" );
--                System.err.println( "*** Please download a new build from http://ci.md-5.net/job/BungeeCord ***" );
-+                System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
-                 System.err.println( "*** You will get NO support regarding this build ***" );
-                 System.err.println( "*** Server will start in 10 seconds ***" );
-                 Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
-@@ -52,7 +52,7 @@ public class BungeeCordLauncher
-
-         BungeeCord bungee = new BungeeCord();
-         ProxyServer.setInstance( bungee );
--        bungee.getLogger().info( "Enabled BungeeCord version " + bungee.getVersion() );
-+        bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
-         bungee.start();
-
-         if ( !options.has( "noconsole" ) )
 diff --git a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
 index f1ccd4f6..d703d6d2 100644
 --- a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
@@ -39,19 +17,6 @@ index f1ccd4f6..d703d6d2 100644
          this.logger = logger;
      }
 
-diff --git a/proxy/src/main/java/Test.java b/proxy/src/main/java/Test.java
-index 9d51608d..446dfe2f 100644
---- a/proxy/src/main/java/Test.java
-+++ b/proxy/src/main/java/Test.java
-@@ -19,7 +19,7 @@ public class Test
-     {
-         BungeeCord bungee = new BungeeCord();
-         ProxyServer.setInstance( bungee );
--        bungee.getLogger().info( "Enabled BungeeCord version " + bungee.getVersion() );
-+        bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
-         bungee.start();
-
-         while ( bungee.isRunning )
 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 20e14557..7fe5bbea 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -74,6 +39,28 @@ index 20e14557..7fe5bbea 100644
      }
 
      @Override
+diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+index c38b8fc2..20681838 100644
+--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
++++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+@@ -43,7 +43,7 @@ public class BungeeCordLauncher
+             if ( buildDate.before( deadline.getTime() ) )
+             {
+                 System.err.println( "*** Warning, this build is outdated ***" );
+-                System.err.println( "*** Please download a new build from http://ci.md-5.net/job/BungeeCord ***" );
++                System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
+                 System.err.println( "*** You will get NO support regarding this build ***" );
+                 System.err.println( "*** Server will start in 10 seconds ***" );
+                 Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
+@@ -52,7 +52,7 @@ public class BungeeCordLauncher
+
+         BungeeCord bungee = new BungeeCord();
+         ProxyServer.setInstance( bungee );
+-        bungee.getLogger().info( "Enabled BungeeCord version " + bungee.getVersion() );
++        bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
+         bungee.start();
+
+         if ( !options.has( "noconsole" ) )
 diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
 index b0798791..b26035cf 100644
 --- a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
@@ -101,10 +88,10 @@ index 771ef5dc..f5c028dd 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 e15c24c1..8a17c8d4 100644
+index 4cfb13c0..0ec6dabb 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
-@@ -208,7 +208,7 @@ public class YamlConfig implements ConfigurationAdapter
+@@ -213,7 +213,7 @@ public class YamlConfig implements ConfigurationAdapter
              Map<String, Object> val = entry.getValue();
              String name = entry.getKey();
              String addr = get( "address", "localhost:25565", val );
@@ -114,5 +101,5 @@ index e15c24c1..8a17c8d4 100644
              InetSocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.19.1
+2.20.1
 
diff --git a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
@@ -1,4 +1,4 @@
-From 646d6568f7a1d99bf28ab4651ffa6f48140a99b2 Mon Sep 17 00:00:00 2001
+From a3365b8976e6e8c5825dce8e65089a173ae1af58 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 25 Oct 2016 11:58:37 -0400
 Subject: [PATCH] Add Waterfall configuration files
@@ -63,7 +63,7 @@ index 7fe5bbea..a8bb4fd0 100644
       * Localization bundle.
       */
 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 d7879d10..1c585e60 100644
+index 36cac069..dddc57a8 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 d7879d10..1c585e60 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 8a17c8d4..5237182a 100644
+index 0ec6dabb..e517ea5d 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
 @@ -44,10 +44,15 @@ public class YamlConfig implements ConfigurationAdapter
@@ -109,14 +109,6 @@ index 8a17c8d4..5237182a 100644
      {
          try
          {
-@@ -83,6 +93,7 @@ public class YamlConfig implements ConfigurationAdapter
-             throw new RuntimeException( "Could not load configuration!", ex );
-         }
-
-+        if (!doPermissions) return;
-         Map<String, Object> permissions = get( "permissions", new HashMap<String, Object>() );
-         if ( permissions.isEmpty() )
-         {
 -- 
-2.19.1
+2.20.1
 
diff --git a/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch b/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch
@@ -1,4 +1,4 @@
-From e53d8ec67e3c51e7b0f4efe1ce0bbf23c7292433 Mon Sep 17 00:00:00 2001
+From 1df2c40d2044cc8992d1fb9c1a646964f30cf162 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
@@ -43,10 +43,10 @@ index a71cc710..0e06b49d 100644
       * 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 d81cda98..29245c94 100644
+index 177b7389..00a1988b 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -214,7 +214,7 @@ public class ServerConnector extends PacketHandler
+@@ -216,7 +216,7 @@ public class ServerConnector extends PacketHandler
 
              ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@@ -56,10 +56,10 @@ index d81cda98..29245c94 100644
 
              user.setDimension( login.getDimension() );
 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 22a5ac05..d4c58098 100644
+index 25b81722..1693f42b 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
-@@ -242,7 +242,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -251,7 +251,7 @@ public class DownstreamBridge extends PacketHandler
 
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@@ -86,5 +86,5 @@ index ffee7062..09486b4a 100644
      {
          @Override
 -- 
-2.19.1
+2.20.1
 
diff --git a/BungeeCord-Patches/0011-Optimize-uuid-conversions.patch b/BungeeCord-Patches/0011-Optimize-uuid-conversions.patch
@@ -1,4 +1,4 @@
-From 42d1be8b5c8bafde6901734fe2c9f28f8f1dbb3f Mon Sep 17 00:00:00 2001
+From 4a5bbd52b44ae6c14c66164cc52e32d32a0b6651 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
@@ -249,10 +249,10 @@ index 88d36ad2..fc92a7b5 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 34dd743c..8c79f9b0 100644
+index dbd77a35..4c5fbb68 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
-@@ -623,7 +623,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -624,7 +624,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {
@@ -262,5 +262,5 @@ index 34dd743c..8c79f9b0 100644
 
      @Override
 -- 
-2.19.1
+2.20.1
 
diff --git a/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch b/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch
@@ -1,4 +1,4 @@
-From 7c47855a7b68728aae3816f8426f23855278b085 Mon Sep 17 00:00:00 2001
+From 63e0068231d004959aa61af1ffe9bcc00dc176d0 Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 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 15fc538a..ad5124e8 100644
+index 00a1988b..3e950918 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
@@ -23,7 +23,7 @@ index 15fc538a..ad5124e8 100644
  import java.util.Queue;
  import java.util.Set;
  import java.util.UUID;
-@@ -98,15 +99,39 @@ public class ServerConnector extends PacketHandler
+@@ -100,15 +101,39 @@ public class ServerConnector extends PacketHandler
              String newHost = copiedHandshake.getHost() + "\00" + user.getAddress().getHostString() + "\00" + user.getUUID();
 
              LoginResult profile = user.getPendingConnection().getLoginProfile();
@@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
       * The FML 1.8 handshake token.
       */
 -- 
-2.19.1
+2.20.1