Updated Upstream (BungeeCord)

Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 1a807731 #3567: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 772ad995 #3566: Bump actions/setup-java from 3 to 4 2431c40a #3562: Bump io.netty:netty-bom from 4.1.100.Final to 4.1.101.Final 8144ae8d #3555: Bump com.mysql:mysql-connector-j from 8.1.0 to 8.2.0 0757c39a Attempt upgrade of resolver libraries
PaperMC · Dec 13, 2023 · 25ecd40 · 25ecd40
1 parent f8ea47e
commit 25ecd40
Show file tree

Hide file tree

Showing 67 changed files with 154 additions and 154 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 3b1984106e3bfd5e2504ae84797ec65d8a8dca42 Mon Sep 17 00:00:00 2001
+From 9ae84f2bd8435cc04badeccfde4fc367b42f6ca3 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
@@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes
 - Deploy to papermc mvn repo
 
 diff --git a/api/pom.xml b/api/pom.xml
-index 30739518..bdccbd78 100644
+index 57567988..3cd57d98 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -4,42 +4,42 @@
@@ -515,7 +515,7 @@ index a4265e54..5e9d29d7 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 9725c974..3a72aa08 100644
+index 6790d07b..3e08cb3c 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -708,7 +708,7 @@ index 4d611101..76a3510d 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 335ee3d5..5558adfb 100644
+index 92d9d2fa..d1c4570d 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -857,5 +857,5 @@ index acb5201f..b7529bf3 100644
 
      <properties>
 -- 
-2.42.0
+2.43.0
 
diff --git a/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch b/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch
@@ -1,11 +1,11 @@
-From f090bbf4ac1184c000210d21a7485c3cb7f24b13 Mon Sep 17 00:00:00 2001
+From 42086afe5cb8e7ec279421c3caf74fdf0ebbc413 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 5135c0fd..233c6aae 100644
+index d1c4570d..fe1506e4 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -119,4 +119,26 @@
@@ -36,5 +36,5 @@ index 5135c0fd..233c6aae 100644
 +    <!-- Waterfall end -->
  </project>
 -- 
-2.17.2 (Apple Git-113)
+2.43.0
 
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,4 +1,4 @@
-From 9ec33f3c55ffd519b35f4a5a822db2e8d993a620 Mon Sep 17 00:00:00 2001
+From 50d10b53f384abd66b95bc44162db95203d97488 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
@@ -18,7 +18,7 @@ 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 c2fe9a40..e3065f12 100644
+index 2024149f..db2a1b99 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -189,7 +189,7 @@ public class BungeeCord extends ProxyServer
@@ -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 150d8739..8ae799c1 100644
+index de85f0b2..b9e99d6c 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 150d8739..8ae799c1 100644
              SocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.38.1
+2.43.0
 
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 7443ac4a48f0afc87dd65b7b467cfc046d056720 Mon Sep 17 00:00:00 2001
+From a75ac072023f7ee77d4bd3754f538dd4d6c70aa8 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
@@ -118,5 +118,5 @@ index b9e99d6c..f6b5e8b8 100644
          if ( permissions == null )
          {
 -- 
-2.42.1
+2.43.0
 
diff --git a/BungeeCord-Patches/0005-Disable-Metrics.patch b/BungeeCord-Patches/0005-Disable-Metrics.patch
@@ -1,12 +1,12 @@
-From d5aef08f1513e5e51b92d60e10e528d7b82ad40d Mon Sep 17 00:00:00 2001
+From 4c9105ed4439711a90b5702e1fc1b4a0d41cffc3 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 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 f1ddb4d0..ffff990a 100644
+index 3429c989..e3eaee39 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -125,7 +125,7 @@ public class BungeeCord extends ProxyServer
@@ -177,5 +177,5 @@ index eabf7573..00000000
 -    }
 -}
 -- 
-2.38.1
+2.43.0
 
diff --git a/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch b/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch
@@ -1,4 +1,4 @@
-From 1345e92a500c226958f02eb98417b117e6605371 Mon Sep 17 00:00:00 2001
+From f2f55cb7743a44bc8d0db757315cbfab4d43f22f Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 11:34:52 -0700
 Subject: [PATCH] Fetch modules from the Waterfall API endpoint
@@ -47,5 +47,5 @@ index 2536435c..5bb86152 100644
          } catch ( IOException ex )
          {
 -- 
-2.37.2.windows.2
+2.43.0
 
diff --git a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
@@ -1,4 +1,4 @@
-From 41b5d168431b57ab75c13f908fdfec83b6081f19 Mon Sep 17 00:00:00 2001
+From 14cad935db7d6dbae502d46d976de2b9c65c9564 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
@@ -26,5 +26,5 @@ index 6cb4c798..680af7d3 100644
      {
 
 -- 
-2.39.2
+2.43.0
 
diff --git a/BungeeCord-Patches/0008-Presize-the-HTTP-response-buffer.patch b/BungeeCord-Patches/0008-Presize-the-HTTP-response-buffer.patch
@@ -1,12 +1,12 @@
-From 0cf87c789c24e97cbadb74d50597c15d85006b26 Mon Sep 17 00:00:00 2001
+From 4632030b32001c18b65c883cab0de4f3688ed5c1 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 13 Apr 2016 15:17:05 -0400
 Subject: [PATCH] Presize the HTTP response buffer
 
 16 characters is extremely small, and all responses start around 256 bytes. 640 characters seems to be good (covering skins and capes), based on sampling profile API responses.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
-index 596ced71..b91981e6 100644
+index a1e59b47..e2911d5e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
 @@ -16,7 +16,7 @@ public class HttpHandler extends SimpleChannelInboundHandler<HttpObject>
@@ -19,5 +19,5 @@ index 596ced71..b91981e6 100644
      @Override
      public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
 -- 
-2.30.1 (Apple Git-130)
+2.43.0
 
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
@@ -1,4 +1,4 @@
-From 27ac1313bc044e08eed698e65f5377ac69f0f31a Mon Sep 17 00:00:00 2001
+From b78e74b5f2a330f2b4544b9d601dc0703cf99aa3 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
@@ -82,5 +82,5 @@ index 5b9c35d1..2d6885a9 100644
      {
          @Override
 -- 
-2.39.2
+2.43.0
 
diff --git a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
@@ -1,4 +1,4 @@
-From 89a9c5c99d3e2e00b2372939540a85567beffa21 Mon Sep 17 00:00:00 2001
+From c04feddfe062c0c5fe5b778a677aeb5d94f93cf7 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
@@ -263,5 +263,5 @@ index b1b087aa..b51263a2 100644
 
      @Override
 -- 
-2.42.1
+2.43.0
 
diff --git a/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch b/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch
@@ -1,4 +1,4 @@
-From 2977421f05d7f1f017682147111f7274c3ba0b91 Mon Sep 17 00:00:00 2001
+From 49b2baa3810475443e50eea4cb36919e94b87f3f 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
@@ -101,5 +101,5 @@ index 6dca2048..f5253b89 100644
       * The FML 1.8 handshake token.
       */
 -- 
-2.39.2
+2.43.0
 
diff --git a/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch b/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
@@ -1,11 +1,11 @@
-From c11014146824ca18446e6175026a088ca23a3369 Mon Sep 17 00:00:00 2001
+From 7f807c4653ad19c7c47a22495b081781ec9fee42 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 17:36:31 -0600
 Subject: [PATCH] Better unit tests for Chat API
 
 
 diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-index 1273e098..2907630d 100644
+index 5319ecf3..df7cf7c6 100644
 --- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
 +++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
 @@ -666,6 +666,26 @@ public class ComponentsTest
@@ -53,5 +53,5 @@ index 9ec5dcb1..e56c8353 100644
 +    }
  }
 -- 
-2.34.1
+2.43.0
 
diff --git a/BungeeCord-Patches/0013-Allow-removing-servers-or-changing-addresses-on-relo.patch b/BungeeCord-Patches/0013-Allow-removing-servers-or-changing-addresses-on-relo.patch
@@ -1,4 +1,4 @@
-From a761cca9133852a90022b32fa030a8c54da035a7 Mon Sep 17 00:00:00 2001
+From 3a0cdd8be9488802c79ab27cc6f92ce0b661624a Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 28 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Allow removing servers or changing addresses on reload
@@ -79,5 +79,5 @@ index 54a6cb38..ecd3b619 100644
 
          for ( ListenerInfo listener : listeners )
 -- 
-2.35.3
+2.43.0
 
diff --git a/BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch b/BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch
@@ -1,4 +1,4 @@
-From 209fd1c50168f4b5d5db23d0cdd7aef25366d79b Mon Sep 17 00:00:00 2001
+From 191e3b8b67359f39bac4d62ee57796eb1e793ce3 Mon Sep 17 00:00:00 2001
 From: Harry <me@harry5573.uk>
 Date: Sun, 24 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Enable TCP_NODELAY.
@@ -18,5 +18,5 @@ index 2d6885a9..3f30da0c 100644
              ch.config().setWriteBufferWaterMark( MARK );
 
 -- 
-2.40.0
+2.43.0
 
diff --git a/BungeeCord-Patches/0015-Micro-optimizations.patch b/BungeeCord-Patches/0015-Micro-optimizations.patch
@@ -1,4 +1,4 @@
-From b5d564124854f1fc8aedc8b5302d4c8098c6de8b Mon Sep 17 00:00:00 2001
+From 87cb9413787e84d11886b19ed594167c8138e688 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
@@ -28,5 +28,5 @@ index b7856d92..61ce9ed6 100644
              String subChannel = in.readUTF();
 
 -- 
-2.39.2
+2.43.0
 
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
@@ -1,4 +1,4 @@
-From 5bcf70b740e218893c47983c08cad7e9e6beb77c Mon Sep 17 00:00:00 2001
+From 0a9a8b758119babf7b970b147ead38f68ee6775c 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
@@ -100,5 +100,5 @@ index 9a47f2ec..b768d54a 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.39.2
+2.43.0
 
diff --git a/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch b/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch
@@ -1,4 +1,4 @@
-From e4cb9d47b2745b761f6c7fd60914ebdb140c695d Mon Sep 17 00:00:00 2001
+From fa78d85d4934194d4b6f0b47d30230fee35ce3db Mon Sep 17 00:00:00 2001
 From: Johannes Donath <johannesd@torchmind.com>
 Date: Sat, 4 Jul 2015 06:31:33 +0200
 Subject: [PATCH] Add basic support for configurable tab-complete throttling
@@ -107,5 +107,5 @@ index 460aa491..84be12e5 100644
          boolean isRegisteredCommand = false;
          boolean isCommand = tabComplete.getCursor().startsWith( "/" );
 -- 
-2.42.1
+2.43.0
 
diff --git 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 3709ce1b52ab1be9e6c6c228843138f44ec23b10 Mon Sep 17 00:00:00 2001
+From 4cc999421f4825bfa3bc5bfd5c298f6e0990a254 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
@@ -69,5 +69,5 @@ index 84be12e5..6acbf7bf 100644
      }
  }
 -- 
-2.39.2
+2.43.0
 
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
@@ -1,4 +1,4 @@
-From d4a8080d52e0fbe372bbcdb375757d064e80f685 Mon Sep 17 00:00:00 2001
+From 024d2e2f36aa3bd5ba5bbf20c79eaf23f1c38c38 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
@@ -29,5 +29,5 @@ index ea3a9248..7b02226f 100644
          disconnect( "" );
      }
 -- 
-2.42.1
+2.43.0
 
diff --git a/BungeeCord-Patches/0020-Use-a-worker-and-a-boss-event-loop-group.patch b/BungeeCord-Patches/0020-Use-a-worker-and-a-boss-event-loop-group.patch
@@ -1,4 +1,4 @@
-From 1e597d86bd5b0bb1fbd197fdc904097e6e96012f Mon Sep 17 00:00:00 2001
+From 9431bb550c8ad9e18872691d9043dac347bb0ac6 Mon Sep 17 00:00:00 2001
 From: kamcio96 <k.nadworski@icloud.com>
 Date: Mon, 14 Mar 2016 16:07:20 -0700
 Subject: [PATCH] Use a worker and a boss event loop group.
@@ -8,7 +8,7 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
 This is proper practice for netty.
 
 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 b09afd88..93a96bfd 100644
+index e3eaee39..89ca9c63 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -120,7 +120,7 @@ public class BungeeCord extends ProxyServer
@@ -83,5 +83,5 @@ index 671cf96f..377df7ec 100644
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
                  .remoteAddress( socketAddress )
 -- 
-2.42.0
+2.43.0
 
diff --git a/BungeeCord-Patches/0021-Better-Decompression-Sanity.patch b/BungeeCord-Patches/0021-Better-Decompression-Sanity.patch
@@ -1,4 +1,4 @@
-From b34e416dfd250b7d97c1ad1c810016203d9e53ab Mon Sep 17 00:00:00 2001
+From 248079a510a933343b7f52004e87a7c38170a5ed 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
@@ -58,5 +58,5 @@ index e8d5ed19..00e03bae 100644
          if ( compressionThreshold < 0 )
          {
 -- 
-2.34.1
+2.43.0
 
diff --git a/BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch b/BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch
@@ -1,4 +1,4 @@
-From 88834135061418ae8c007a335e2c0e5772f52ce5 Mon Sep 17 00:00:00 2001
+From 507a31bafc173948203073eed02cf798677e522e Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 25 Oct 2016 12:34:41 -0400
 Subject: [PATCH] Validate that chat messages are non-blank
@@ -32,5 +32,5 @@ index 6acbf7bf..05e3bd21 100644
          ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
          if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
 -- 
-2.42.1
+2.43.0
 
diff --git a/BungeeCord-Patches/0023-Add-dynamic-server-addition-removal-api.patch b/BungeeCord-Patches/0023-Add-dynamic-server-addition-removal-api.patch
@@ -1,4 +1,4 @@
-From 5db60dbe715d4f186caee02e5cbbba4df5b23d90 Mon Sep 17 00:00:00 2001
+From adfd4ad0550d3830f1bf6baac86ad64f01f228e8 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 04:29:25 +0200
 Subject: [PATCH] Add dynamic server addition/removal api.
@@ -170,7 +170,7 @@ index 59c104d3..698b420f 100644
              private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
 
 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 93a96bfd..5af9c3bb 100644
+index 89ca9c63..b35236f5 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -664,10 +664,18 @@ public class BungeeCord extends ProxyServer
@@ -311,5 +311,5 @@ index ecd3b619..7094fe0b 100644
 +    // Waterfall end
  }
 -- 
-2.42.0
+2.43.0