From 5e70cbd8599e9bea5ce76b39b1a6f563c0d49446 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Sun, 31 Jul 2016 14:02:30 -0400 Subject: [PATCH] Upgrade to Netty 4.1.4.Final and remove depracated patch. fixes #67 --- .../0008-Upgrade-to-netty-4.1.patch | 6 ++-- ...ze-to-8MB-and-don-t-append-to-exist.patch} | 2 +- ...-a-more-reasonable-Recycler-Capacity.patch | 30 ------------------- ...erty-to-accept-invalid-ping-packets.patch} | 6 ++-- ...hat-messages-before-connecting-to-t.patch} | 4 +-- ...ction-closing-fixing-the-kick-delay.patch} | 4 +-- ...-worker-and-a-boss-event-loop-group.patch} | 6 ++-- ...=> 0029-Better-Decompression-Sanity.patch} | 4 +-- ...race-when-the-ByteBuf-is-not-direct.patch} | 4 +-- ...te-that-chat-messages-are-non-blank.patch} | 4 +-- ...ad-of-lots-and-lots-of-teams-with-t.patch} | 4 +-- ...s.patch => 0033-Better-debug-checks.patch} | 4 +-- ...CK-packets-while-in-HANDSHAKE-state.patch} | 4 +-- ...he-console-to-tab-complete-commands.patch} | 2 +- ...dynamic-server-addition-removal-api.patch} | 6 ++-- ...tch => 0037-Improve-ServerKickEvent.patch} | 2 +- ...ble-server-version-in-ping-response.patch} | 4 +-- ...-timeout-variant-to-connect-methods.patch} | 2 +- ...ent.patch => 0040-Proxy-query-event.patch} | 2 +- 19 files changed, 35 insertions(+), 65 deletions(-) rename BungeeCord-Patches/{0025-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch => 0024-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch} (92%) delete mode 100644 BungeeCord-Patches/0024-Set-a-more-reasonable-Recycler-Capacity.patch rename BungeeCord-Patches/{0026-Add-a-property-to-accept-invalid-ping-packets.patch => 0025-Add-a-property-to-accept-invalid-ping-packets.patch} (91%) rename BungeeCord-Patches/{0027-Ignore-incoming-chat-messages-before-connecting-to-t.patch => 0026-Ignore-incoming-chat-messages-before-connecting-to-t.patch} (95%) rename BungeeCord-Patches/{0028-Improve-connection-closing-fixing-the-kick-delay.patch => 0027-Improve-connection-closing-fixing-the-kick-delay.patch} (99%) rename BungeeCord-Patches/{0029-Use-a-worker-and-a-boss-event-loop-group.patch => 0028-Use-a-worker-and-a-boss-event-loop-group.patch} (97%) rename BungeeCord-Patches/{0030-Better-Decompression-Sanity.patch => 0029-Better-Decompression-Sanity.patch} (96%) rename BungeeCord-Patches/{0031-Print-stack-trace-when-the-ByteBuf-is-not-direct.patch => 0030-Print-stack-trace-when-the-ByteBuf-is-not-direct.patch} (93%) rename BungeeCord-Patches/{0032-Validate-that-chat-messages-are-non-blank.patch => 0031-Validate-that-chat-messages-are-non-blank.patch} (95%) rename BungeeCord-Patches/{0033-Reduce-the-overhead-of-lots-and-lots-of-teams-with-t.patch => 0032-Reduce-the-overhead-of-lots-and-lots-of-teams-with-t.patch} (99%) rename BungeeCord-Patches/{0034-Better-debug-checks.patch => 0033-Better-debug-checks.patch} (91%) rename BungeeCord-Patches/{0035-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch => 0034-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch} (93%) rename BungeeCord-Patches/{0036-Allow-the-console-to-tab-complete-commands.patch => 0035-Allow-the-console-to-tab-complete-commands.patch} (98%) rename BungeeCord-Patches/{0037-Add-dynamic-server-addition-removal-api.patch => 0036-Add-dynamic-server-addition-removal-api.patch} (98%) rename BungeeCord-Patches/{0038-Improve-ServerKickEvent.patch => 0037-Improve-ServerKickEvent.patch} (99%) rename BungeeCord-Patches/{0039-Configurable-server-version-in-ping-response.patch => 0038-Configurable-server-version-in-ping-response.patch} (96%) rename BungeeCord-Patches/{0040-Add-timeout-variant-to-connect-methods.patch => 0039-Add-timeout-variant-to-connect-methods.patch} (98%) rename BungeeCord-Patches/{0041-Proxy-query-event.patch => 0040-Proxy-query-event.patch} (99%) diff --git a/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch b/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch index 4d204ab..d691b72 100644 --- a/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch +++ b/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch @@ -1,4 +1,4 @@ -From 9815eaa1ddf85d5d73c6b2b2b5b67d8d8e6d3a59 Mon Sep 17 00:00:00 2001 +From f9ab276db558a01a10184f0ab69dbff535c45f2c Mon Sep 17 00:00:00 2001 From: Techcable Date: Tue, 3 May 2016 20:31:52 -0700 Subject: [PATCH] Upgrade to netty 4.1 @@ -7,7 +7,7 @@ Don't access a ByteBuf's underlying array with ByteBuf.array() - ByteBuf.array() returns the underlying array storage, and does *not* return a view of the buffer as an array diff --git a/pom.xml b/pom.xml -index ead929e..bd19538 100644 +index 3319e60..858d367 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ @@ -15,7 +15,7 @@ index ead929e..bd19538 100644 unknown - 4.0.40.Final -+ 4.1.3.Final ++ 4.1.4.Final 1.8 1.8 diff --git a/BungeeCord-Patches/0025-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch b/BungeeCord-Patches/0024-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch similarity index 92% rename from BungeeCord-Patches/0025-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch rename to BungeeCord-Patches/0024-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch index cb52cfb..58b59c9 100644 --- a/BungeeCord-Patches/0025-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch +++ b/BungeeCord-Patches/0024-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch @@ -1,4 +1,4 @@ -From 122422dc3cd5b263372cd535c229ed716a5fc9f2 Mon Sep 17 00:00:00 2001 +From 4a151731fbbde0de5a62f1f86ce6e2e35cfbc456 Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 14 Feb 2016 01:03:27 -0500 Subject: [PATCH] Reduce max log size to 8MB and don't append to existing log diff --git a/BungeeCord-Patches/0024-Set-a-more-reasonable-Recycler-Capacity.patch b/BungeeCord-Patches/0024-Set-a-more-reasonable-Recycler-Capacity.patch deleted file mode 100644 index bd7370b..0000000 --- a/BungeeCord-Patches/0024-Set-a-more-reasonable-Recycler-Capacity.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8231b50a6a9304a31324eb05e2a2ca1484485bd4 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Mon, 5 Oct 2015 23:20:54 -0400 -Subject: [PATCH] Set a more reasonable Recycler Capacity - -Default Netty Recycler capacity is 262k~, resulting in major memory -consumption over long runtimes that will never free. - -This lowers it by 80%, which should only even be hit on the largest of servers. - -diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java -index 2a41a50..29e2294 100644 ---- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java -+++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java -@@ -20,6 +20,12 @@ public class BungeeCordLauncher - Security.setProperty( "networkaddress.cache.ttl", "30" ); - Security.setProperty( "networkaddress.cache.negative.ttl", "10" ); - -+ // TODO: remove .default for netty 5! -+ if ( System.getProperty( "io.netty.recycler.maxCapacity.default" ) == null ) -+ { -+ System.setProperty( "io.netty.recycler.maxCapacity.default", "50000" ); -+ } -+ - OptionParser parser = new OptionParser(); - parser.allowsUnrecognizedOptions(); - parser.acceptsAll( Arrays.asList( "v", "version" ) ); --- -2.8.3 - diff --git a/BungeeCord-Patches/0026-Add-a-property-to-accept-invalid-ping-packets.patch b/BungeeCord-Patches/0025-Add-a-property-to-accept-invalid-ping-packets.patch similarity index 91% rename from BungeeCord-Patches/0026-Add-a-property-to-accept-invalid-ping-packets.patch rename to BungeeCord-Patches/0025-Add-a-property-to-accept-invalid-ping-packets.patch index 25cf319..4cb97f3 100644 --- a/BungeeCord-Patches/0026-Add-a-property-to-accept-invalid-ping-packets.patch +++ b/BungeeCord-Patches/0025-Add-a-property-to-accept-invalid-ping-packets.patch @@ -1,4 +1,4 @@ -From b46cf908db2da253ee392ba53f04601850e2ac50 Mon Sep 17 00:00:00 2001 +From 1add5dd68f4fb1c33c68e6cd8747e31109ec288c Mon Sep 17 00:00:00 2001 From: Techcable Date: Sun, 7 Feb 2016 00:01:19 -0700 Subject: [PATCH] Add a property to accept invalid ping packets @@ -9,7 +9,7 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm Fixes #23 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 c2348eb..d841090 100644 +index 501d5ba..d3635cd 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 @@ -243,10 +243,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -29,5 +29,5 @@ index c2348eb..d841090 100644 disconnect( "" ); } -- -2.8.3 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0027-Ignore-incoming-chat-messages-before-connecting-to-t.patch b/BungeeCord-Patches/0026-Ignore-incoming-chat-messages-before-connecting-to-t.patch similarity index 95% rename from BungeeCord-Patches/0027-Ignore-incoming-chat-messages-before-connecting-to-t.patch rename to BungeeCord-Patches/0026-Ignore-incoming-chat-messages-before-connecting-to-t.patch index 5ead926..0364beb 100644 --- a/BungeeCord-Patches/0027-Ignore-incoming-chat-messages-before-connecting-to-t.patch +++ b/BungeeCord-Patches/0026-Ignore-incoming-chat-messages-before-connecting-to-t.patch @@ -1,4 +1,4 @@ -From c3aabd2ed7a723485822d408a648a7cb9a078183 Mon Sep 17 00:00:00 2001 +From bd4122240743638c9866b1e772383fbfdc902665 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Tue, 23 Jun 2015 21:56:13 +0200 Subject: [PATCH] Ignore incoming chat messages before connecting to the @@ -43,5 +43,5 @@ index a96e793..50f0308 100644 } throw CancelSendSignal.INSTANCE; -- -2.8.3 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0028-Improve-connection-closing-fixing-the-kick-delay.patch b/BungeeCord-Patches/0027-Improve-connection-closing-fixing-the-kick-delay.patch similarity index 99% rename from BungeeCord-Patches/0028-Improve-connection-closing-fixing-the-kick-delay.patch rename to BungeeCord-Patches/0027-Improve-connection-closing-fixing-the-kick-delay.patch index 55cfc81..de4224f 100644 --- a/BungeeCord-Patches/0028-Improve-connection-closing-fixing-the-kick-delay.patch +++ b/BungeeCord-Patches/0027-Improve-connection-closing-fixing-the-kick-delay.patch @@ -1,4 +1,4 @@ -From 5bb1ba3fe06286ebef3e708cf720ee9cc84fcfb4 Mon Sep 17 00:00:00 2001 +From 711c32e4db459754e39df0b6dbea885866c97ca1 Mon Sep 17 00:00:00 2001 From: kamcio96 Date: Mon, 14 Mar 2016 15:59:52 -0700 Subject: [PATCH] Improve connection closing, fixing the kick delay. @@ -223,5 +223,5 @@ index 06d19c3..76bdff2 100644 { Preconditions.checkState( ch.eventLoop().inEventLoop(), "cannot add handler outside of event loop" ); -- -2.8.2 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0029-Use-a-worker-and-a-boss-event-loop-group.patch b/BungeeCord-Patches/0028-Use-a-worker-and-a-boss-event-loop-group.patch similarity index 97% rename from BungeeCord-Patches/0029-Use-a-worker-and-a-boss-event-loop-group.patch rename to BungeeCord-Patches/0028-Use-a-worker-and-a-boss-event-loop-group.patch index c77fa7d..22d5547 100644 --- a/BungeeCord-Patches/0029-Use-a-worker-and-a-boss-event-loop-group.patch +++ b/BungeeCord-Patches/0028-Use-a-worker-and-a-boss-event-loop-group.patch @@ -1,4 +1,4 @@ -From 4d40f54046e9113e3ba08caab380499922c02ba3 Mon Sep 17 00:00:00 2001 +From 52ef7c8d439549b5eb9b5015264a2c865a6f49c5 Mon Sep 17 00:00:00 2001 From: kamcio96 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 fd8d9b0..d0739c1 100644 +index ee62b7b..f676f0e 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -106,7 +106,7 @@ public class BungeeCord extends ProxyServer @@ -83,5 +83,5 @@ index bc56d4f..efcba31 100644 .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable .remoteAddress( getAddress() ) -- -2.8.3 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0030-Better-Decompression-Sanity.patch b/BungeeCord-Patches/0029-Better-Decompression-Sanity.patch similarity index 96% rename from BungeeCord-Patches/0030-Better-Decompression-Sanity.patch rename to BungeeCord-Patches/0029-Better-Decompression-Sanity.patch index 9d8fed3..5720efb 100644 --- a/BungeeCord-Patches/0030-Better-Decompression-Sanity.patch +++ b/BungeeCord-Patches/0029-Better-Decompression-Sanity.patch @@ -1,4 +1,4 @@ -From 7dc90ef86d89ca211b2698325319b343947ccd66 Mon Sep 17 00:00:00 2001 +From d76fe372b47a510746e01075097b590c782f7312 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 18 Mar 2016 10:53:24 -0700 Subject: [PATCH] Better Decompression Sanity @@ -58,5 +58,5 @@ index 76bdff2..f5c8f0a 100644 if ( compressionThreshold == -1 ) { -- -2.8.3 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0031-Print-stack-trace-when-the-ByteBuf-is-not-direct.patch b/BungeeCord-Patches/0030-Print-stack-trace-when-the-ByteBuf-is-not-direct.patch similarity index 93% rename from BungeeCord-Patches/0031-Print-stack-trace-when-the-ByteBuf-is-not-direct.patch rename to BungeeCord-Patches/0030-Print-stack-trace-when-the-ByteBuf-is-not-direct.patch index 3453e1e..fc6b2a6 100644 --- a/BungeeCord-Patches/0031-Print-stack-trace-when-the-ByteBuf-is-not-direct.patch +++ b/BungeeCord-Patches/0030-Print-stack-trace-when-the-ByteBuf-is-not-direct.patch @@ -1,4 +1,4 @@ -From b9e07cfb20542a5db8f08539c6472c3178e6e39a Mon Sep 17 00:00:00 2001 +From 0a518cb93992ed5256e19aecfb758e1fe430f60f Mon Sep 17 00:00:00 2001 From: Techcable Date: Tue, 5 Apr 2016 11:00:16 -0700 Subject: [PATCH] Print stack trace when the ByteBuf is not direct. @@ -19,5 +19,5 @@ index 29e54db..6da27fc 100644 // See https://github.com/SpigotMC/BungeeCord/issues/1717 -- -2.8.3 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0032-Validate-that-chat-messages-are-non-blank.patch b/BungeeCord-Patches/0031-Validate-that-chat-messages-are-non-blank.patch similarity index 95% rename from BungeeCord-Patches/0032-Validate-that-chat-messages-are-non-blank.patch rename to BungeeCord-Patches/0031-Validate-that-chat-messages-are-non-blank.patch index b332d4b..f841190 100644 --- a/BungeeCord-Patches/0032-Validate-that-chat-messages-are-non-blank.patch +++ b/BungeeCord-Patches/0031-Validate-that-chat-messages-are-non-blank.patch @@ -1,4 +1,4 @@ -From 082cb79ea1bf91ec488e39b30e7178d7db515f71 Mon Sep 17 00:00:00 2001 +From 7ae054404e2ff41e6af15fc5bacf8d4e72863f6d Mon Sep 17 00:00:00 2001 From: Tux Date: Wed, 13 Apr 2016 14:00:40 -0400 Subject: [PATCH] Validate that chat messages are non-blank @@ -53,5 +53,5 @@ index 7565ff9..42bb2fb 100644 ServerConnection server = con.getServer(); -- -2.8.3 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0033-Reduce-the-overhead-of-lots-and-lots-of-teams-with-t.patch b/BungeeCord-Patches/0032-Reduce-the-overhead-of-lots-and-lots-of-teams-with-t.patch similarity index 99% rename from BungeeCord-Patches/0033-Reduce-the-overhead-of-lots-and-lots-of-teams-with-t.patch rename to BungeeCord-Patches/0032-Reduce-the-overhead-of-lots-and-lots-of-teams-with-t.patch index 41ecd71..3d54816 100644 --- a/BungeeCord-Patches/0033-Reduce-the-overhead-of-lots-and-lots-of-teams-with-t.patch +++ b/BungeeCord-Patches/0032-Reduce-the-overhead-of-lots-and-lots-of-teams-with-t.patch @@ -1,4 +1,4 @@ -From 19c64c2c2af38732cebc271aef220a5f894135aa Mon Sep 17 00:00:00 2001 +From 30b4b1c6421a677f3ad621d55243ddf3fba7937f Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 25 Apr 2016 23:46:00 -0700 Subject: [PATCH] Reduce the overhead of lots and lots of teams with the same @@ -293,5 +293,5 @@ index 0000000..5aa306a + +} -- -2.8.3 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0034-Better-debug-checks.patch b/BungeeCord-Patches/0033-Better-debug-checks.patch similarity index 91% rename from BungeeCord-Patches/0034-Better-debug-checks.patch rename to BungeeCord-Patches/0033-Better-debug-checks.patch index 60efebb..1c61777 100644 --- a/BungeeCord-Patches/0034-Better-debug-checks.patch +++ b/BungeeCord-Patches/0033-Better-debug-checks.patch @@ -1,4 +1,4 @@ -From c4b8b2246bf27e3eba36cda3e719ada63ba7ddcf Mon Sep 17 00:00:00 2001 +From c10db955bcaf7fcee09f851df57779a2e36f98e5 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 6 Apr 2016 23:46:00 -0700 Subject: [PATCH] Better debug checks @@ -18,5 +18,5 @@ index db2843f..4decbb2 100644 return protocolData.packetMap.get( packet ); } -- -2.6.3 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0035-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch b/BungeeCord-Patches/0034-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch similarity index 93% rename from BungeeCord-Patches/0035-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch rename to BungeeCord-Patches/0034-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch index 8eac3ef..5fcb5ad 100644 --- a/BungeeCord-Patches/0035-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch +++ b/BungeeCord-Patches/0034-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch @@ -1,4 +1,4 @@ -From fe96d6163b2fcbceb6ea28617a8a871983232136 Mon Sep 17 00:00:00 2001 +From 051b34e76129d73c31452e99e508543e688b049f 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 @@ -30,5 +30,5 @@ index 378231c..132b73d 100644 } } -- -2.8.2 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0036-Allow-the-console-to-tab-complete-commands.patch b/BungeeCord-Patches/0035-Allow-the-console-to-tab-complete-commands.patch similarity index 98% rename from BungeeCord-Patches/0036-Allow-the-console-to-tab-complete-commands.patch rename to BungeeCord-Patches/0035-Allow-the-console-to-tab-complete-commands.patch index e5dae30..416fe04 100644 --- a/BungeeCord-Patches/0036-Allow-the-console-to-tab-complete-commands.patch +++ b/BungeeCord-Patches/0035-Allow-the-console-to-tab-complete-commands.patch @@ -1,4 +1,4 @@ -From f2c7fc036031311e09d1aad4b28c227993bf6fc5 Mon Sep 17 00:00:00 2001 +From 7159c2b756cd2ee54aa078a1c8298f517350b0f3 Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Sun, 14 Feb 2016 15:54:40 +0000 Subject: [PATCH] Allow the console to tab complete commands diff --git a/BungeeCord-Patches/0037-Add-dynamic-server-addition-removal-api.patch b/BungeeCord-Patches/0036-Add-dynamic-server-addition-removal-api.patch similarity index 98% rename from BungeeCord-Patches/0037-Add-dynamic-server-addition-removal-api.patch rename to BungeeCord-Patches/0036-Add-dynamic-server-addition-removal-api.patch index d025e7f..1ab9685 100644 --- a/BungeeCord-Patches/0037-Add-dynamic-server-addition-removal-api.patch +++ b/BungeeCord-Patches/0036-Add-dynamic-server-addition-removal-api.patch @@ -1,4 +1,4 @@ -From d7d5585dd6576c5ee2d50c88f5b020ab96726138 Mon Sep 17 00:00:00 2001 +From 8942694e72894ba95b161ed3a60407cfe13836e2 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Wed, 29 Jun 2016 04:29:25 +0200 Subject: [PATCH] Add dynamic server addition/removal api. @@ -144,7 +144,7 @@ index 1366f44..05ec159 100644 { int index = path.indexOf( SEPARATOR ); 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 fc5ca3a..92ea9b5 100644 +index 5600b70..63e1cd9 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -559,10 +559,18 @@ public class BungeeCord extends ProxyServer @@ -285,5 +285,5 @@ index db9ebbd..4d16fa3 100644 + // Waterfall end } -- -2.9.0.windows.1 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0038-Improve-ServerKickEvent.patch b/BungeeCord-Patches/0037-Improve-ServerKickEvent.patch similarity index 99% rename from BungeeCord-Patches/0038-Improve-ServerKickEvent.patch rename to BungeeCord-Patches/0037-Improve-ServerKickEvent.patch index dfdf65f..8b83d38 100644 --- a/BungeeCord-Patches/0038-Improve-ServerKickEvent.patch +++ b/BungeeCord-Patches/0037-Improve-ServerKickEvent.patch @@ -1,4 +1,4 @@ -From 80a0bf1992f1ad7e080692ba323a784c3aee3fd3 Mon Sep 17 00:00:00 2001 +From fcedeac8bcc63478092a4963c159fe8b91bd310d Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 28 Jun 2016 23:00:49 -0500 Subject: [PATCH] Improve ServerKickEvent diff --git a/BungeeCord-Patches/0039-Configurable-server-version-in-ping-response.patch b/BungeeCord-Patches/0038-Configurable-server-version-in-ping-response.patch similarity index 96% rename from BungeeCord-Patches/0039-Configurable-server-version-in-ping-response.patch rename to BungeeCord-Patches/0038-Configurable-server-version-in-ping-response.patch index 8fdb7b0..8c78735 100644 --- a/BungeeCord-Patches/0039-Configurable-server-version-in-ping-response.patch +++ b/BungeeCord-Patches/0038-Configurable-server-version-in-ping-response.patch @@ -1,4 +1,4 @@ -From 6d435eb0afdd47cf90abb505cf4bf0a943ec73bd Mon Sep 17 00:00:00 2001 +From af7ec26e1e2d03942c89b3ec824e1dbb89ef293e 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 @@ -59,7 +59,7 @@ index 114961d..32f7b99 100644 @Override 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 92ea9b5..b1b959d 100644 +index 63e1cd9..1d6e535 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -608,7 +608,7 @@ public class BungeeCord extends ProxyServer diff --git a/BungeeCord-Patches/0040-Add-timeout-variant-to-connect-methods.patch b/BungeeCord-Patches/0039-Add-timeout-variant-to-connect-methods.patch similarity index 98% rename from BungeeCord-Patches/0040-Add-timeout-variant-to-connect-methods.patch rename to BungeeCord-Patches/0039-Add-timeout-variant-to-connect-methods.patch index 96c969a..b877029 100644 --- a/BungeeCord-Patches/0040-Add-timeout-variant-to-connect-methods.patch +++ b/BungeeCord-Patches/0039-Add-timeout-variant-to-connect-methods.patch @@ -1,4 +1,4 @@ -From 062766d296509d5a201d6c0815eb0a608698a712 Mon Sep 17 00:00:00 2001 +From 0951d1ef84b66805847d3b990afb7f5a3f049ede 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/0041-Proxy-query-event.patch b/BungeeCord-Patches/0040-Proxy-query-event.patch similarity index 99% rename from BungeeCord-Patches/0041-Proxy-query-event.patch rename to BungeeCord-Patches/0040-Proxy-query-event.patch index fca9fd9..178b996 100644 --- a/BungeeCord-Patches/0041-Proxy-query-event.patch +++ b/BungeeCord-Patches/0040-Proxy-query-event.patch @@ -1,4 +1,4 @@ -From 81f57993d2aa0f7595a469c3eaa33cbaf32e3b79 Mon Sep 17 00:00:00 2001 +From 451365fa3e94a851ef9650dc472c6d59e0f1ae0a Mon Sep 17 00:00:00 2001 From: minecrafter Date: Sun, 3 Jul 2016 04:03:21 -0400 Subject: [PATCH] Proxy query event