diff --git a/BungeeCord b/BungeeCord index bba5098..1c5bff7 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit bba5098ff169c0a57ccf8c30c8b9e00e44d1f831 +Subproject commit 1c5bff7ed7c0abfd5a3ffcb193e002b6695d82bd diff --git a/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch index 1565175..edaa491 100644 --- a/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch +++ b/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch @@ -1,4 +1,4 @@ -From 66d704b15011f245e02fce6aade947314d313861 Mon Sep 17 00:00:00 2001 +From 3df6fbcb505e1b3b136e4708aadf6ed515bda9b6 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 19 May 2016 17:09:22 -0600 Subject: [PATCH] Allow invalid packet ids for forge servers @@ -37,10 +37,10 @@ index ea44573d..5b32effe 100644 { packet.read( in, prot.getDirection(), protocolVersion ); diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java -index 06390751..93e81266 100644 +index c4dd00a5..acd28a94 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java -@@ -394,14 +394,23 @@ public enum Protocol +@@ -395,14 +395,23 @@ public enum Protocol return protocol; } @@ -105,10 +105,10 @@ index 99cd19a1..6146cb44 100644 @Getter @NonNull diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java -index d1eebbf0..2843b94e 100644 +index af4da071..7c19c6fb 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java -@@ -268,6 +268,12 @@ public abstract class EntityMap +@@ -273,6 +273,12 @@ public abstract class EntityMap int packetId = DefinedPacket.readVarInt( packet ); int packetIdLength = packet.readerIndex() - readerIndex; @@ -122,5 +122,5 @@ index d1eebbf0..2843b94e 100644 { rewriteInt( packet, oldId, newId, readerIndex + packetIdLength ); -- -2.19.0 +2.19.1 diff --git a/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch index 2656b26..cb46ad8 100644 --- a/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch +++ b/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch @@ -1,4 +1,4 @@ -From 6135e1158f1499d6b85a3cc62cb06ef861b15cbd Mon Sep 17 00:00:00 2001 +From 95bf6d885b4e1604bc9fa3781d3cfa3cdf7f45df Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 22 Sep 2017 12:46:47 +0200 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for @@ -267,7 +267,7 @@ index ddd91e8d..565e70a4 100644 protocol proxy diff --git a/proxy/pom.xml b/proxy/pom.xml -index 2efeaa9e..df84d6f1 100644 +index 3542b6da..dff5bc74 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -70,7 +70,7 @@ @@ -280,7 +280,7 @@ index 2efeaa9e..df84d6f1 100644 compile @@ -98,6 +98,20 @@ - 5.1.46 + 5.1.47 runtime +