From c74411e6ddc59ad6822336939da99e6bbf550416 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 3 Jan 2019 06:07:37 +0000
Subject: [PATCH] Update BungeeCord

---
 BungeeCord                                             |  2 +-
 .../0018-Resolve-sendData-deadlocks.patch              |  8 ++++----
 ...0022-Use-a-worker-and-a-boss-event-loop-group.patch | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/BungeeCord b/BungeeCord
index 5ef5dd2..9a2acc8 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 5ef5dd2c098b69908a04a4ca2dc06824ec2e75c1
+Subproject commit 9a2acc826e4cc37642219f718cdb8c1eca0c8703
diff --git a/BungeeCord-Patches/0018-Resolve-sendData-deadlocks.patch b/BungeeCord-Patches/0018-Resolve-sendData-deadlocks.patch
index 1a2d9d4..315e1fb 100644
--- a/BungeeCord-Patches/0018-Resolve-sendData-deadlocks.patch
+++ b/BungeeCord-Patches/0018-Resolve-sendData-deadlocks.patch
@@ -1,14 +1,14 @@
-From 469d9ee9dec07060a1feba3bb5390a93600df3f1 Mon Sep 17 00:00:00 2001
+From 5084ea690834f6ccf37c28f927d4345560b0896a Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Fri, 12 Feb 2016 23:55:53 -0500
 Subject: [PATCH] Resolve sendData() deadlocks
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-index c0703afa..875ad538 100644
+index 3ff3446b..f4c17cf4 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-@@ -101,19 +101,22 @@ public class BungeeServerInfo implements ServerInfo
+@@ -107,19 +107,22 @@ public class BungeeServerInfo implements ServerInfo
          Preconditions.checkNotNull( channel, "channel" );
          Preconditions.checkNotNull( data, "data" );
  
@@ -43,5 +43,5 @@ index c0703afa..875ad538 100644
  
      @Override
 -- 
-2.19.1
+2.20.1
 
diff --git a/BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch b/BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch
index cf4a24d..431ab3e 100644
--- a/BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch
+++ b/BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch
@@ -1,4 +1,4 @@
-From 1fbaa495ef6ed9601f2d9479b2d2b228d3474274 Mon Sep 17 00:00:00 2001
+From 646fe1ca409a835cd6880bfe4909c49c7a5a0036 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 19b897c0..20ef5b0d 100644
+index eb369ebb..d8ea68ea 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -116,7 +116,7 @@ public class BungeeCord extends ProxyServer
@@ -70,10 +70,10 @@ index 19b897c0..20ef5b0d 100644
  
                  getLogger().info( "Thank you and goodbye" );
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-index 875ad538..ec96d1fd 100644
+index f4c17cf4..4c0637b9 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-@@ -145,7 +145,7 @@ public class BungeeServerInfo implements ServerInfo
+@@ -151,7 +151,7 @@ public class BungeeServerInfo implements ServerInfo
          };
          new Bootstrap()
                  .channel( PipelineUtils.getChannel() )
@@ -83,5 +83,5 @@ index 875ad538..ec96d1fd 100644
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
                  .remoteAddress( getAddress() )
 -- 
-2.19.1
+2.20.1