diff --git a/BungeeCord b/BungeeCord index f1c32f8..855d152 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit f1c32f84f46589632d7721d8de87d5589ef8e6a6 +Subproject commit 855d1525038369950db427b8ea7299fb6227f0f3 diff --git a/BungeeCord-Patches/0055-Bump-Netty-to-4.1.49.Final.patch b/BungeeCord-Patches/0055-Bump-Netty-to-4.1.49.Final.patch deleted file mode 100644 index 77066f4..0000000 --- a/BungeeCord-Patches/0055-Bump-Netty-to-4.1.49.Final.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3839feee87336320de5d39dc5a70fd82e90d63ef Mon Sep 17 00:00:00 2001 -From: Andrew Steinborn -Date: Wed, 22 Apr 2020 10:22:09 -0400 -Subject: [PATCH] Bump Netty to 4.1.49.Final - -Fixes https://github.com/netty/netty/issues/10165, also known as -"bungeecrasher" amongst other names. - -diff --git a/pom.xml b/pom.xml -index f6ff86a2..c9531d39 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -91,7 +91,7 @@ - - - unknown -- 4.1.48.Final -+ 4.1.49.Final - 1.8 - 1.8 - UTF-8 --- -2.26.2 -