Fix broken build

BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch

@@ -1,11 +1,11 @@
-From 636977900f68dd634ed201865e83c1543f265f79 Mon Sep 17 00:00:00 2001
+From 45c296f3f138f1c6197f90c2dd9735f4f0d0f89a 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/TranslatableComponentTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
-index 453d375..1a2ffd0 100644
+index 453d375d..1a2ffd0b 100644
 --- a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
 +++ b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
 @@ -3,6 +3,8 @@ package net.md_5.bungee.api.chat;
@@ -44,7 +44,7 @@ index 453d375..1a2ffd0 100644
 +    }
  }
 diff --git a/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java b/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java
-index 004a2b7..f34eb3d 100644
+index 004a2b7a..f34eb3d2 100644
 --- a/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java
 +++ b/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java
 @@ -123,6 +123,26 @@ public class ComponentsTest
@@ -75,5 +75,5 @@ index 004a2b7..f34eb3d 100644
      public void testLoopSimple()
      {
 -- 
-2.8.3
+2.13.4
 

BungeeCord-Patches/0014-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch

@@ -1,11 +1,11 @@
-From f8d0ba43375d4b294aadadbd7209b290fe196c0b Mon Sep 17 00:00:00 2001
+From 9d898013e9f35678e2a42c1c7c56db9363bc3975 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@optic.tv>
 Date: Mon, 6 Jul 2015 18:59:29 -0500
 Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit
 
 
 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 2b17e7a..34e3c3e 100644
+index 2b17e7a7..34e3c3e3 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -320,6 +320,8 @@ public class BungeeCord extends ProxyServer
@@ -18,5 +18,5 @@ index 2b17e7a..34e3c3e 100644
                      .childHandler( PipelineUtils.SERVER_CHILD )
                      .group( eventLoops )
 -- 
-2.7.4 (Apple Git-66)
+2.13.4
 

BungeeCord-Patches/0015-Allow-removing-servers-or-changing-addresses-on-relo.patch

@@ -1,4 +1,4 @@
-From 0734250ce1c5f9406fd23d69cb5c66e09ac5a73d Mon Sep 17 00:00:00 2001
+From f2c85421fa39e5506a48d37647dbf416bd1b4ecd 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
@@ -10,7 +10,7 @@ Kicks players on failure to move.
 Original Issue: https://github.com/WaterfallMC/Waterfall-Old/issues/17
 
 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 1d267a63..b3ff1448 100644
+index 4a55c0e2..d131c02c 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
 @@ -11,12 +11,15 @@ import java.util.UUID;
@@ -72,5 +72,5 @@ index 1d267a63..b3ff1448 100644
              }
          }
 -- 
-2.12.0
+2.13.4
 

BungeeCord-Patches/0016-Enable-TCP_NODELAY.patch

@@ -1,4 +1,4 @@
-From 44948384b21aae93e25edb1fe70ee2911b5e8c53 Mon Sep 17 00:00:00 2001
+From fd00d6cac0a91f0b160af2396292583facd44090 Mon Sep 17 00:00:00 2001
 From: Harry <me@harry5573.uk>
 Date: Wed, 24 Feb 2016 17:16:23 +0000
 Subject: [PATCH] Enable TCP_NODELAY.
@@ -6,7 +6,7 @@ Subject: [PATCH] Enable TCP_NODELAY.
 This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance.
 
 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 384d958..67624b3 100644
+index 384d9588..67624b35 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
 @@ -128,6 +128,7 @@ public class PipelineUtils
@@ -18,5 +18,5 @@ index 384d958..67624b3 100644
  
              ch.pipeline().addLast( TIMEOUT_HANDLER, new ReadTimeoutHandler( BungeeCord.getInstance().config.getTimeout(), TimeUnit.MILLISECONDS ) );
 -- 
-2.7.4 (Apple Git-66)
+2.13.4
 

BungeeCord-Patches/0023-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch

@@ -1,4 +1,4 @@
-From b5c843ea9c67d816e7fd64f89aced24fa356d3b0 Mon Sep 17 00:00:00 2001
+From 1dd8fe7f8fcef4f63a0c3c8f78fdf426b4c57c71 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 14 Feb 2016 01:03:27 -0500
 Subject: [PATCH] Reduce max log size to 8MB and don't append to existing log
@@ -6,7 +6,7 @@ Subject: [PATCH] Reduce max log size to 8MB and don't append to existing log
 
 
 diff --git a/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java b/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java
-index 9598fff..2a2e0ed 100644
+index 9598fff3..2a2e0ed2 100644
 --- a/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java
 +++ b/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java
 @@ -27,7 +27,7 @@ public class BungeeLogger extends Logger
@@ -19,5 +19,5 @@ index 9598fff..2a2e0ed 100644
              addHandler( fileHandler );
  
 -- 
-2.7.4
+2.13.4
 

BungeeCord-Patches/0034-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From 348778a0921761d2b7f02f8869cca9cea097d3dd Mon Sep 17 00:00:00 2001
+From d3dccce243eced81e3a907f92df37ea5d1ceebe2 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
@@ -75,10 +75,18 @@ index f8532dc2..c447524e 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 c2e751be..62d982a4 100644
+index c2e751be..0d8ae30f 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
-@@ -59,16 +59,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
+ import com.google.common.io.ByteArrayDataOutput;
+ import com.google.common.io.ByteStreams;
+ import java.io.DataInput;
++import java.util.Objects; // Waterfall
+ import io.netty.buffer.ByteBuf;
+ import io.netty.buffer.ByteBufAllocator;
+ import io.netty.buffer.Unpooled;
+@@ -59,16 +60,19 @@ public class DownstreamBridge extends PacketHandler
              return;
          }
  
@@ -103,7 +111,7 @@ index c2e751be..62d982a4 100644
      }
  
      @Override
-@@ -83,7 +86,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -83,7 +87,19 @@ public class DownstreamBridge extends PacketHandler
  
          if ( !server.isObsolete() )
          {
@@ -124,12 +132,12 @@ index c2e751be..62d982a4 100644
          }
  
          ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-@@ -454,7 +469,11 @@ public class DownstreamBridge extends PacketHandler
+@@ -454,7 +470,11 @@ public class DownstreamBridge extends PacketHandler
      public void handle(Kick kick) throws Exception
      {
          ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
 -        ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, server.getInfo(), ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTED ) );
-+        if ( Objects.equal( server.getInfo(), def ) )
++        if ( Objects.equals( server.getInfo(), def ) )
 +        {
 +            def = null;
 +        }

BungeeCord-Patches/0039-Fix-potion-race-condition-on-Forge-1.8.9.patch

@@ -1,4 +1,4 @@
-From 8550aafdc7f84fbf9909d2dea105564b369eb2f1 Mon Sep 17 00:00:00 2001
+From 1a161fa1370c7ea4f7e008c4924cd5f47e106720 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
@@ -188,10 +188,10 @@ index 3e8e2170..a3201946 100644
      @Getter
      private String displayName;
 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 62d982a4..2e2d5d20 100644
+index 0d8ae30f..70b5a415 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
-@@ -30,6 +30,8 @@ import net.md_5.bungee.netty.PacketHandler;
+@@ -31,6 +31,8 @@ import net.md_5.bungee.netty.PacketHandler;
  import net.md_5.bungee.protocol.DefinedPacket;
  import net.md_5.bungee.protocol.PacketWrapper;
  import net.md_5.bungee.protocol.packet.BossBar;
@@ -200,7 +200,7 @@ index 62d982a4..2e2d5d20 100644
  import net.md_5.bungee.protocol.packet.KeepAlive;
  import net.md_5.bungee.protocol.packet.PlayerListItem;
  import net.md_5.bungee.protocol.packet.Respawn;
-@@ -520,6 +522,32 @@ public class DownstreamBridge extends PacketHandler
+@@ -521,6 +523,32 @@ public class DownstreamBridge extends PacketHandler
          }
      }