diff --git a/BungeeCord b/BungeeCord index 9e76966..70038c9 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 9e76966e0fc46e4bdc61cfe97f14cd8b98290d8c +Subproject commit 70038c91442eeba7b96ec065491f57201805beac diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch index 3c8ee8b..9c538c6 100644 --- a/BungeeCord-Patches/0001-POM-Changes.patch +++ b/BungeeCord-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 8ea2d9b727f96c880a72bedffac8e4e01dc2b277 Mon Sep 17 00:00:00 2001 +From 41a4567c85b0cb1133ce5aac8a6a14561db911d0 Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 19:33:31 +0200 Subject: [PATCH] POM Changes @@ -67,7 +67,7 @@ index 79d2d367..f0348e13 100644 compile diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml -index 96c4a83a..c49d8503 100644 +index acc6aa97..cce76af4 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -4,19 +4,19 @@ @@ -168,7 +168,7 @@ index 5f87b60d..7ad05abb 100644 diff --git a/config/pom.xml b/config/pom.xml -index 24b6ce1c..9d0fe24b 100644 +index 83c36691..0ffb071c 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -4,19 +4,19 @@ @@ -483,7 +483,7 @@ index 959aae03..b5aeb99e 100644 diff --git a/pom.xml b/pom.xml -index 3d0f45ef..a10650d3 100644 +index 27d46c41..537bf1a9 100644 --- a/pom.xml +++ b/pom.xml @@ -3,18 +3,25 @@ @@ -578,7 +578,7 @@ index 3d0f45ef..a10650d3 100644 unknown - 4.1.34.Final + 4.1.43.Final - 1.7 - 1.7 + @@ -604,7 +604,7 @@ index 3d0f45ef..a10650d3 100644 + org.apache.maven.plugins maven-checkstyle-plugin - 3.0.0 + 3.1.0 @@ -143,6 +177,7 @@ @@ -743,7 +743,7 @@ index 61fedc71..2493fc17 100644 compile diff --git a/proxy/pom.xml b/proxy/pom.xml -index 50fb11be..e25697f7 100644 +index c6bb8fe3..cb02928c 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -4,18 +4,18 @@ @@ -855,5 +855,5 @@ index 9cc2f80b..1fd54029 100644 compile -- -2.21.0 +2.24.0 diff --git a/BungeeCord-Patches/0028-Add-callEvent-shortcut-to-Event.patch b/BungeeCord-Patches/0027-Add-callEvent-shortcut-to-Event.patch similarity index 94% rename from BungeeCord-Patches/0028-Add-callEvent-shortcut-to-Event.patch rename to BungeeCord-Patches/0027-Add-callEvent-shortcut-to-Event.patch index 2514569..7da2cba 100644 --- a/BungeeCord-Patches/0028-Add-callEvent-shortcut-to-Event.patch +++ b/BungeeCord-Patches/0027-Add-callEvent-shortcut-to-Event.patch @@ -1,4 +1,4 @@ -From 6a5a9d5c523d1d6d5e9f12a0e219142280e834a8 Mon Sep 17 00:00:00 2001 +From 7742a95b8a8db9a8be6e6abd6c4c89e39f6e970e Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 14 Apr 2019 19:15:00 +0300 Subject: [PATCH] Add callEvent() shortcut to Event diff --git a/BungeeCord-Patches/0027-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch b/BungeeCord-Patches/0027-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch deleted file mode 100644 index 613e13c..0000000 --- a/BungeeCord-Patches/0027-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 85dea98d06763a3709aa6f6fb2354453e336ae59 Mon Sep 17 00:00:00 2001 -From: Techcable -Date: Mon, 6 Jun 2016 13:36:10 -0600 -Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state - - -diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 6a193d6f..b76eae23 100644 ---- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -565,7 +565,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection - @Override - public void disconnect(final BaseComponent... reason) - { -- if ( thisState != State.STATUS && thisState != State.PING ) -+ if ( thisState != State.STATUS && thisState != State.PING && thisState != State.HANDSHAKE ) // Waterfall: Don't kick during handshake - { - ch.delayedClose( new Kick( ComponentSerializer.toString( reason ) ) ); - } else --- -2.21.0 - diff --git a/BungeeCord-Patches/0029-Improve-ServerKickEvent.patch b/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch similarity index 99% rename from BungeeCord-Patches/0029-Improve-ServerKickEvent.patch rename to BungeeCord-Patches/0028-Improve-ServerKickEvent.patch index 6da41b4..d458ada 100644 --- a/BungeeCord-Patches/0029-Improve-ServerKickEvent.patch +++ b/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch @@ -1,4 +1,4 @@ -From 930ffdff589d30cd8cfc15b398bf70b1cf2b5906 Mon Sep 17 00:00:00 2001 +From bb190fef52bf84e2e51d6cfe63fafccdc025070b Mon Sep 17 00:00:00 2001 From: Nathan Poirier Date: Tue, 28 Jun 2016 23:00:49 -0500 Subject: [PATCH] Improve ServerKickEvent diff --git a/BungeeCord-Patches/0030-Configurable-server-version-in-ping-response.patch b/BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch similarity index 98% rename from BungeeCord-Patches/0030-Configurable-server-version-in-ping-response.patch rename to BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch index c55780a..e455096 100644 --- a/BungeeCord-Patches/0030-Configurable-server-version-in-ping-response.patch +++ b/BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch @@ -1,4 +1,4 @@ -From f021efcef99484823fbed75a007b134c9769fbf3 Mon Sep 17 00:00:00 2001 +From 648840e84ec1a31f3937803146006a880ded4f98 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Wed, 29 Jun 2016 13:56:57 -0500 Subject: [PATCH] Configurable server version in ping response diff --git a/BungeeCord-Patches/0031-Add-timeout-variant-to-connect-methods.patch b/BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch similarity index 98% rename from BungeeCord-Patches/0031-Add-timeout-variant-to-connect-methods.patch rename to BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch index 674bb1b..584beff 100644 --- a/BungeeCord-Patches/0031-Add-timeout-variant-to-connect-methods.patch +++ b/BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch @@ -1,4 +1,4 @@ -From e86199307b640cdc3f09f5c0b3598bb0213f4c03 Mon Sep 17 00:00:00 2001 +From 7255231edac6dddba09610516d4580be97e8c31f Mon Sep 17 00:00:00 2001 From: Ichbinjoe Date: Sat, 16 Jul 2016 20:44:01 -0400 Subject: [PATCH] Add timeout variant to connect methods diff --git a/BungeeCord-Patches/0032-Proxy-query-event.patch b/BungeeCord-Patches/0031-Proxy-query-event.patch similarity index 99% rename from BungeeCord-Patches/0032-Proxy-query-event.patch rename to BungeeCord-Patches/0031-Proxy-query-event.patch index 949eb9a..e5c6e87 100644 --- a/BungeeCord-Patches/0032-Proxy-query-event.patch +++ b/BungeeCord-Patches/0031-Proxy-query-event.patch @@ -1,4 +1,4 @@ -From d849f888b91b373c86660bfda66bf8a31feb3a87 Mon Sep 17 00:00:00 2001 +From 676d9efac23847cd502a244c85c10ebece3455b6 Mon Sep 17 00:00:00 2001 From: minecrafter Date: Sun, 3 Jul 2016 04:03:21 -0400 Subject: [PATCH] Proxy query event diff --git a/BungeeCord-Patches/0033-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch b/BungeeCord-Patches/0032-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch similarity index 97% rename from BungeeCord-Patches/0033-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch rename to BungeeCord-Patches/0032-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch index b0fe3de..6ec7196 100644 --- a/BungeeCord-Patches/0033-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch +++ b/BungeeCord-Patches/0032-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch @@ -1,4 +1,4 @@ -From bf20d24559bf3db47ae4603e5f8a5f052668e72d Mon Sep 17 00:00:00 2001 +From 638c2dead03891867bded50eb96c3d074ff0b99e Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 4 Aug 2016 19:30:49 -0700 Subject: [PATCH] Dump the raw hex of a packet on a decoding error diff --git a/BungeeCord-Patches/0034-Fix-potion-race-condition-on-Forge-1.8.9.patch b/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch similarity index 99% rename from BungeeCord-Patches/0034-Fix-potion-race-condition-on-Forge-1.8.9.patch rename to BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch index 5360d33..be790ec 100644 --- a/BungeeCord-Patches/0034-Fix-potion-race-condition-on-Forge-1.8.9.patch +++ b/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch @@ -1,4 +1,4 @@ -From 70385f459bf33a77b6d9b5bdfaead134c87d9059 Mon Sep 17 00:00:00 2001 +From 98c28b0323fc82e0b66defb47898c1bf7d8abacd Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Thu, 15 Sep 2016 22:38:37 +0200 Subject: [PATCH] Fix potion race condition on Forge 1.8.9 diff --git a/BungeeCord-Patches/0035-Optionally-use-async-Netty-DNS-resolver.patch b/BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch similarity index 98% rename from BungeeCord-Patches/0035-Optionally-use-async-Netty-DNS-resolver.patch rename to BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch index 9b3e71e..70aeddd 100644 --- a/BungeeCord-Patches/0035-Optionally-use-async-Netty-DNS-resolver.patch +++ b/BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch @@ -1,4 +1,4 @@ -From eaf7f322c0f65d3a7168b49901b94c6fdaee75e0 Mon Sep 17 00:00:00 2001 +From c64e18322664b2b19ff86f05fa389611016cee5e Mon Sep 17 00:00:00 2001 From: Tux Date: Wed, 21 Dec 2016 03:13:03 -0500 Subject: [PATCH] Optionally use async Netty DNS resolver @@ -24,7 +24,7 @@ index db615ed9..af93ae8c 100644 /** diff --git a/proxy/pom.xml b/proxy/pom.xml -index 5a81d36f..e637cf99 100644 +index 2d66e26d..3ba7d5cb 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -41,6 +41,14 @@ diff --git a/BungeeCord-Patches/0036-Improve-outdated-build-message.patch b/BungeeCord-Patches/0035-Improve-outdated-build-message.patch similarity index 95% rename from BungeeCord-Patches/0036-Improve-outdated-build-message.patch rename to BungeeCord-Patches/0035-Improve-outdated-build-message.patch index 189c7eb..3838391 100644 --- a/BungeeCord-Patches/0036-Improve-outdated-build-message.patch +++ b/BungeeCord-Patches/0035-Improve-outdated-build-message.patch @@ -1,4 +1,4 @@ -From 3e62abd6465ce419209e248223c5622cb9c9427d Mon Sep 17 00:00:00 2001 +From b01f3decf7099e6df46436c73e3c9538cfad54cd Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Sat, 10 Jun 2017 20:56:02 +0100 Subject: [PATCH] Improve outdated build message diff --git a/BungeeCord-Patches/0037-Fix-some-forge-plugin-message-packets-not-being-forw.patch b/BungeeCord-Patches/0036-Fix-some-forge-plugin-message-packets-not-being-forw.patch similarity index 97% rename from BungeeCord-Patches/0037-Fix-some-forge-plugin-message-packets-not-being-forw.patch rename to BungeeCord-Patches/0036-Fix-some-forge-plugin-message-packets-not-being-forw.patch index d41a2e2..c448100 100644 --- a/BungeeCord-Patches/0037-Fix-some-forge-plugin-message-packets-not-being-forw.patch +++ b/BungeeCord-Patches/0036-Fix-some-forge-plugin-message-packets-not-being-forw.patch @@ -1,4 +1,4 @@ -From 6c079814560d12b3646a5b34083fddccf6f04777 Mon Sep 17 00:00:00 2001 +From 2a7ba258faff6dedbaab0c2dbc5ce1aec78d7339 Mon Sep 17 00:00:00 2001 From: Daniel Naylor Date: Mon, 17 Jul 2017 20:24:17 +0100 Subject: [PATCH] Fix some forge plugin message packets not being forwarded diff --git a/BungeeCord-Patches/0038-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch similarity index 98% rename from BungeeCord-Patches/0038-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch rename to BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch index 5c9126b..023c572 100644 --- a/BungeeCord-Patches/0038-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 4406b903bea747d93a8d5e5e5cd0c8e9abc1d648 Mon Sep 17 00:00:00 2001 +From de5b8da1251e2f5ccfb9286576819314ec71dce2 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml -index c49d8503..487fb3bb 100644 +index cce76af4..2c1fcc8b 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -47,6 +47,9 @@ @@ -233,7 +233,7 @@ index 00000000..93ce3b14 + + diff --git a/pom.xml b/pom.xml -index 516b87eb..eff0bf2e 100644 +index 537bf1a9..6de9e6ae 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,7 @@ @@ -245,7 +245,7 @@ index 516b87eb..eff0bf2e 100644 protocol proxy diff --git a/proxy/pom.xml b/proxy/pom.xml -index e637cf99..440e128f 100644 +index 3ba7d5cb..11f75a3d 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -70,7 +70,7 @@ @@ -258,7 +258,7 @@ index e637cf99..440e128f 100644 compile @@ -104,6 +104,20 @@ - 5.1.47 + 5.1.48 runtime + diff --git a/BungeeCord-Patches/0039-Handle-plugin-prefixes-using-Log4J.patch b/BungeeCord-Patches/0038-Handle-plugin-prefixes-using-Log4J.patch similarity index 97% rename from BungeeCord-Patches/0039-Handle-plugin-prefixes-using-Log4J.patch rename to BungeeCord-Patches/0038-Handle-plugin-prefixes-using-Log4J.patch index 4a55ee6..e7295d0 100644 --- a/BungeeCord-Patches/0039-Handle-plugin-prefixes-using-Log4J.patch +++ b/BungeeCord-Patches/0038-Handle-plugin-prefixes-using-Log4J.patch @@ -1,4 +1,4 @@ -From 70c91e73a4cca638bfdc7291d6398c11d4632598 Mon Sep 17 00:00:00 2001 +From 2205994921a10600becdb405c2e06a1f8ec0c18b Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 22 Sep 2017 13:07:31 +0200 Subject: [PATCH] Handle plugin prefixes using Log4J diff --git a/BungeeCord-Patches/0040-Allow-plugins-to-use-SLF4J-for-logging.patch b/BungeeCord-Patches/0039-Allow-plugins-to-use-SLF4J-for-logging.patch similarity index 96% rename from BungeeCord-Patches/0040-Allow-plugins-to-use-SLF4J-for-logging.patch rename to BungeeCord-Patches/0039-Allow-plugins-to-use-SLF4J-for-logging.patch index fc77b31..5d44f00 100644 --- a/BungeeCord-Patches/0040-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/BungeeCord-Patches/0039-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -1,4 +1,4 @@ -From 08581c8b99aff9e68af6efe1eff049fa0c20e84c Mon Sep 17 00:00:00 2001 +From 1558f727fd65e501a94f0c7f4db134465514d54f Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 22 Sep 2017 13:15:09 +0200 Subject: [PATCH] Allow plugins to use SLF4J for logging diff --git a/BungeeCord-Patches/0041-Add-Log4j-configuration-that-replicates-the-old-Bung.patch b/BungeeCord-Patches/0040-Add-Log4j-configuration-that-replicates-the-old-Bung.patch similarity index 97% rename from BungeeCord-Patches/0041-Add-Log4j-configuration-that-replicates-the-old-Bung.patch rename to BungeeCord-Patches/0040-Add-Log4j-configuration-that-replicates-the-old-Bung.patch index 58b039b..16137bd 100644 --- a/BungeeCord-Patches/0041-Add-Log4j-configuration-that-replicates-the-old-Bung.patch +++ b/BungeeCord-Patches/0040-Add-Log4j-configuration-that-replicates-the-old-Bung.patch @@ -1,4 +1,4 @@ -From 644d8176535454cdb75758d60a06dfdf039ac029 Mon Sep 17 00:00:00 2001 +From dca4832c1fa97a4c98229a20e75afd4197c44560 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sun, 24 Sep 2017 12:06:49 +0200 Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord diff --git a/BungeeCord-Patches/0042-Add-console-command-completion.patch b/BungeeCord-Patches/0041-Add-console-command-completion.patch similarity index 98% rename from BungeeCord-Patches/0042-Add-console-command-completion.patch rename to BungeeCord-Patches/0041-Add-console-command-completion.patch index 7a71047..5b71bd2 100644 --- a/BungeeCord-Patches/0042-Add-console-command-completion.patch +++ b/BungeeCord-Patches/0041-Add-console-command-completion.patch @@ -1,4 +1,4 @@ -From 4549ec6bd14bd769d8320d016d5d34fe96c00a7e Mon Sep 17 00:00:00 2001 +From f3129d715da03a91a0f1aca6eea0bd88bd01a2e4 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 26 Sep 2017 18:59:37 +0200 Subject: [PATCH] Add console command completion diff --git a/BungeeCord-Patches/0043-Providing-access-to-the-player-s-LoginResult-on-Logi.patch b/BungeeCord-Patches/0042-Providing-access-to-the-player-s-LoginResult-on-Logi.patch similarity index 96% rename from BungeeCord-Patches/0043-Providing-access-to-the-player-s-LoginResult-on-Logi.patch rename to BungeeCord-Patches/0042-Providing-access-to-the-player-s-LoginResult-on-Logi.patch index 594d23c..88fef0f 100644 --- a/BungeeCord-Patches/0043-Providing-access-to-the-player-s-LoginResult-on-Logi.patch +++ b/BungeeCord-Patches/0042-Providing-access-to-the-player-s-LoginResult-on-Logi.patch @@ -1,4 +1,4 @@ -From ed7843b8eb9b37f64cbe73630dc52776572b9b80 Mon Sep 17 00:00:00 2001 +From d561d41bfae92eebd1871ee0b7a57801f18aed2f Mon Sep 17 00:00:00 2001 From: phenomax Date: Thu, 10 Aug 2017 18:41:17 +0200 Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent @@ -52,7 +52,7 @@ similarity index 100% rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index b76eae23..fecc597f 100644 +index c3f9eb1d..e3f8bcf6 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -547,7 +547,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection diff --git a/BungeeCord-Patches/0044-Optionally-log-InitialHandler-connections.patch b/BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch similarity index 97% rename from BungeeCord-Patches/0044-Optionally-log-InitialHandler-connections.patch rename to BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch index 21397e2..25f9b29 100644 --- a/BungeeCord-Patches/0044-Optionally-log-InitialHandler-connections.patch +++ b/BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch @@ -1,4 +1,4 @@ -From ffda80e664efc2156d1474b1ec4abfb987572e91 Mon Sep 17 00:00:00 2001 +From 1155588afc687d686d734ad71cdb779daa1fe669 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 8 Feb 2018 19:10:52 +0100 Subject: [PATCH] Optionally log InitialHandler connections @@ -61,7 +61,7 @@ index ef44d334..4ff8da6d 100644 public String getGameVersion() { return gameVersion; diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index fecc597f..3a9dab68 100644 +index e3f8bcf6..34f7f997 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -314,7 +314,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection diff --git a/BungeeCord-Patches/0045-Forge-is-a-first-class-citizen.patch b/BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch similarity index 96% rename from BungeeCord-Patches/0045-Forge-is-a-first-class-citizen.patch rename to BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch index 224e836..8d5d6f4 100644 --- a/BungeeCord-Patches/0045-Forge-is-a-first-class-citizen.patch +++ b/BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch @@ -1,4 +1,4 @@ -From f29bdb9f175e765243c4d771f1a80c950849f90c Mon Sep 17 00:00:00 2001 +From e46ca84dfcda26de04ccdd61a0707452ab704768 Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Mon, 28 May 2018 21:43:55 +0100 Subject: [PATCH] Forge is a first class citizen diff --git a/BungeeCord-Patches/0046-Ignore-empty-packets.patch b/BungeeCord-Patches/0045-Ignore-empty-packets.patch similarity index 96% rename from BungeeCord-Patches/0046-Ignore-empty-packets.patch rename to BungeeCord-Patches/0045-Ignore-empty-packets.patch index 0dfa417..16d5660 100644 --- a/BungeeCord-Patches/0046-Ignore-empty-packets.patch +++ b/BungeeCord-Patches/0045-Ignore-empty-packets.patch @@ -1,4 +1,4 @@ -From 12fc5d0903a7673c88d9357fa9118c4ae9439dbe Mon Sep 17 00:00:00 2001 +From bd5e179c3c66f82c335e431905b5a19b47353b3b Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 12 Oct 2018 14:28:52 +0100 Subject: [PATCH] Ignore empty packets diff --git a/BungeeCord-Patches/0047-Don-t-use-a-bytebuf-for-packet-decoding.patch b/BungeeCord-Patches/0046-Don-t-use-a-bytebuf-for-packet-decoding.patch similarity index 97% rename from BungeeCord-Patches/0047-Don-t-use-a-bytebuf-for-packet-decoding.patch rename to BungeeCord-Patches/0046-Don-t-use-a-bytebuf-for-packet-decoding.patch index 4ecc357..4901eb6 100644 --- a/BungeeCord-Patches/0047-Don-t-use-a-bytebuf-for-packet-decoding.patch +++ b/BungeeCord-Patches/0046-Don-t-use-a-bytebuf-for-packet-decoding.patch @@ -1,4 +1,4 @@ -From bcb2723d0375e32d8269ba0e726d0ff5392bfbee Mon Sep 17 00:00:00 2001 +From 95eb27b9ffc5ed020a048f967eda6d224a4deb28 Mon Sep 17 00:00:00 2001 From: creeper123123321 Date: Thu, 17 Jan 2019 03:25:59 +0000 Subject: [PATCH] Don't use a bytebuf for packet decoding diff --git a/BungeeCord-Patches/0048-Provide-an-option-to-disable-entity-metadata-rewriti.patch b/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch similarity index 99% rename from BungeeCord-Patches/0048-Provide-an-option-to-disable-entity-metadata-rewriti.patch rename to BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch index 35a9bc6..95d36d7 100644 --- a/BungeeCord-Patches/0048-Provide-an-option-to-disable-entity-metadata-rewriti.patch +++ b/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch @@ -1,4 +1,4 @@ -From f7542c565dea3eb834520e2a29793e2a15e0cadd Mon Sep 17 00:00:00 2001 +From 0e88d1a3be4a4d500bf6ce78100a066252ded0b0 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 14 Jan 2019 03:35:21 +0000 Subject: [PATCH] Provide an option to disable entity metadata rewriting diff --git a/BungeeCord-Patches/0049-Add-ProxyDefineCommandsEvent.patch b/BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch similarity index 98% rename from BungeeCord-Patches/0049-Add-ProxyDefineCommandsEvent.patch rename to BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch index 67ab091..aee1587 100644 --- a/BungeeCord-Patches/0049-Add-ProxyDefineCommandsEvent.patch +++ b/BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch @@ -1,4 +1,4 @@ -From 85e6170d87e299a889b66413641e513d5398622e Mon Sep 17 00:00:00 2001 +From db8ebffad5c5672869f7f1401e525683b4e30f40 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 14 Mar 2019 07:44:06 +0000 Subject: [PATCH] Add ProxyDefineCommandsEvent diff --git a/BungeeCord-Patches/0050-Use-proper-max-length-for-serverbound-chat-packet.patch b/BungeeCord-Patches/0049-Use-proper-max-length-for-serverbound-chat-packet.patch similarity index 97% rename from BungeeCord-Patches/0050-Use-proper-max-length-for-serverbound-chat-packet.patch rename to BungeeCord-Patches/0049-Use-proper-max-length-for-serverbound-chat-packet.patch index 9e8ed92..17021d9 100644 --- a/BungeeCord-Patches/0050-Use-proper-max-length-for-serverbound-chat-packet.patch +++ b/BungeeCord-Patches/0049-Use-proper-max-length-for-serverbound-chat-packet.patch @@ -1,4 +1,4 @@ -From adbb5913dc06726b5264dd68c98018de31fe4b96 Mon Sep 17 00:00:00 2001 +From bc5cbc9ac8635443a70d6c4b98500135dcc3a847 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 20 Mar 2019 21:39:12 -0700 Subject: [PATCH] Use proper max length for serverbound chat packet diff --git a/BungeeCord-Patches/0051-Report-slow-events-in-milliseconds.patch b/BungeeCord-Patches/0050-Report-slow-events-in-milliseconds.patch similarity index 95% rename from BungeeCord-Patches/0051-Report-slow-events-in-milliseconds.patch rename to BungeeCord-Patches/0050-Report-slow-events-in-milliseconds.patch index bd9ac8c..c75942b 100644 --- a/BungeeCord-Patches/0051-Report-slow-events-in-milliseconds.patch +++ b/BungeeCord-Patches/0050-Report-slow-events-in-milliseconds.patch @@ -1,4 +1,4 @@ -From 89fc27a7357e908a0ab107d90dd982a55d266a41 Mon Sep 17 00:00:00 2001 +From a4d949a57edd3e44403db85279ee99d229b000fa Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 26 Mar 2019 04:28:18 +0000 Subject: [PATCH] Report slow events in milliseconds diff --git a/BungeeCord-Patches/0052-Fix-upstream-javadocs.patch b/BungeeCord-Patches/0051-Fix-upstream-javadocs.patch similarity index 98% rename from BungeeCord-Patches/0052-Fix-upstream-javadocs.patch rename to BungeeCord-Patches/0051-Fix-upstream-javadocs.patch index 398b243..64ed33f 100644 --- a/BungeeCord-Patches/0052-Fix-upstream-javadocs.patch +++ b/BungeeCord-Patches/0051-Fix-upstream-javadocs.patch @@ -1,4 +1,4 @@ -From c432f07f93bb678c953a7e3dbbea03b330158152 Mon Sep 17 00:00:00 2001 +From 674e6779cd3c7db539ead28bf224cfdf6bbfc5a9 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 30 Mar 2019 15:11:11 +0000 Subject: [PATCH] Fix upstream javadocs diff --git a/BungeeCord-Patches/0053-OSX-native-zlib-and-crypto.patch b/BungeeCord-Patches/0052-OSX-native-zlib-and-crypto.patch similarity index 99% rename from BungeeCord-Patches/0053-OSX-native-zlib-and-crypto.patch rename to BungeeCord-Patches/0052-OSX-native-zlib-and-crypto.patch index 570ecbd..a30ddf5 100644 --- a/BungeeCord-Patches/0053-OSX-native-zlib-and-crypto.patch +++ b/BungeeCord-Patches/0052-OSX-native-zlib-and-crypto.patch @@ -1,4 +1,4 @@ -From a21b245f42f32de0176c7a4db7fe38cfdd794c7b Mon Sep 17 00:00:00 2001 +From bf4a21dfcdf4007b8ece29546e1fe55ba418e10b Mon Sep 17 00:00:00 2001 From: Colin Godsey Date: Tue, 16 Apr 2019 07:25:52 -0600 Subject: [PATCH] OSX native zlib and crypto diff --git a/BungeeCord-Patches/0054-Speed-up-packet-construction.patch b/BungeeCord-Patches/0053-Speed-up-packet-construction.patch similarity index 99% rename from BungeeCord-Patches/0054-Speed-up-packet-construction.patch rename to BungeeCord-Patches/0053-Speed-up-packet-construction.patch index 10f0293..25ade79 100644 --- a/BungeeCord-Patches/0054-Speed-up-packet-construction.patch +++ b/BungeeCord-Patches/0053-Speed-up-packet-construction.patch @@ -1,4 +1,4 @@ -From a6d7ff3161071b244adb7657e6ba7c8ef657452b Mon Sep 17 00:00:00 2001 +From 82ea2adbd242f2a04655208bdb2de26ef4d2634d Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 17 Apr 2019 09:24:38 +0300 Subject: [PATCH] Speed up packet construction diff --git a/BungeeCord-Patches/0055-Cache-session-exceptions.patch b/BungeeCord-Patches/0054-Cache-session-exceptions.patch similarity index 97% rename from BungeeCord-Patches/0055-Cache-session-exceptions.patch rename to BungeeCord-Patches/0054-Cache-session-exceptions.patch index fd17cd3..266107a 100644 --- a/BungeeCord-Patches/0055-Cache-session-exceptions.patch +++ b/BungeeCord-Patches/0054-Cache-session-exceptions.patch @@ -1,4 +1,4 @@ -From bd5df76b8ece271ade0dbe455e9e88934100e97e Mon Sep 17 00:00:00 2001 +From c38cefc98046895ed5e3e905b529ef45da5df6d6 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 25 Nov 2019 19:54:06 +0000 Subject: [PATCH] Cache session exceptions