Revert to BungeeCord behaviour for the 'not direct byte buf' business

Not worth the time wasted on closing invalid bug reports.
This commit is contained in:
Jamie Mansfield 2017-10-23 19:53:51 +01:00
parent 4c8715286f
commit b5d048b57a
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
28 changed files with 49 additions and 36 deletions

View File

@ -1,4 +1,4 @@
From 6ca6da8d88b2bce759145bb60b11ecb045aa1863 Mon Sep 17 00:00:00 2001
From 88b1421ce7a232107d3c5b1866718f4ff98ad630 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 10:55:20 -0700
Subject: [PATCH] Configurable Waterfall Metrics
@ -46,7 +46,7 @@ index f9e277dc..056b8040 100644
}
}
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 7eaf7fb5..1582cf52 100644
index 78808fb9..4f4c9773 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -290,7 +290,9 @@ public class BungeeCord extends ProxyServer
@ -82,5 +82,5 @@ index 95239878..e482e98c 100644
// Connect to the website
URLConnection connection;
--
2.12.0
2.14.1

View File

@ -1,4 +1,4 @@
From a55de5a537a9b50c470e67e77608d702d830e40b Mon Sep 17 00:00:00 2001
From bda34a59361b9de7bbbede5d9aeb30e835f87128 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:34:52 -0700
Subject: [PATCH] Fetch modules from the Waterfall CI
@ -40,5 +40,5 @@ index 2536435c..e1cf0010 100644
} catch ( IOException ex )
{
--
2.12.0
2.14.1

View File

@ -1,4 +1,4 @@
From cd5bcb84aa20c6405a4b434c046af687f129286f Mon Sep 17 00:00:00 2001
From 14f34d2b4d9cdc5c963169f0037f2d779bee69b6 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Mon, 25 Jan 2016 01:19:07 -0500
Subject: [PATCH] Get rid of the security manager.
@ -6,7 +6,7 @@ Subject: [PATCH] Get rid of the security manager.
There's a lot of opinions running on both sides of the debate, but we overwhelmingly feel that the security manager does not help the vast majority of BungeeCord users or plugin developers create correct code.
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 1582cf52..fbec9e86 100644
index 4f4c9773..0d7d1adf 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -181,8 +181,6 @@ public class BungeeCord extends ProxyServer
@ -103,5 +103,5 @@ index 53c81923..00000000
- }
-}
--
2.12.0
2.14.1

View File

@ -1,4 +1,4 @@
From 413435b7f36587ca4cc562d1ffc373fa24b6296d Mon Sep 17 00:00:00 2001
From 64569da83643499139a52d19b196ef0643c5d281 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 13 Apr 2016 15:17:05 -0400
Subject: [PATCH] Presize the HTTP response buffer
@ -6,7 +6,7 @@ Subject: [PATCH] Presize the HTTP response buffer
16 characters is extremely small, and all responses start around 256 bytes. 640 characters seems to be good (covering skins and capes), based on sampling profile API responses.
diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
index 96d0a71..bac6b1b 100644
index 96d0a71d..bac6b1b0 100644
--- a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
@@ -16,7 +16,7 @@ public class HttpHandler extends SimpleChannelInboundHandler<HttpObject>
@ -19,5 +19,5 @@ index 96d0a71..bac6b1b 100644
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
--
2.8.3
2.14.1

View File

@ -1,4 +1,4 @@
From efe1e7fd8d05933f94e21c8be493f41a6a8d0025 Mon Sep 17 00:00:00 2001
From 55d79ca12bc3bbab71449754efcb268d8d7f9781 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -56,7 +56,7 @@ index 6c31f15f..4a96a601 100644
user.setDimension( login.getDimension() );
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 4049e815..1010f361 100644
index 6b8ae245..a92b806c 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -240,7 +240,7 @@ public class DownstreamBridge extends PacketHandler

View File

@ -1,4 +1,4 @@
From f215e5c743dcd9dbb47bb6188367188b8cf87500 Mon Sep 17 00:00:00 2001
From a0a5c4270f1529e454c7b0f817ebdab7b17cb5d3 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Sat, 21 May 2016 17:17:36 -0600
Subject: [PATCH] Fix unicode characters in configuration files

View File

@ -1,4 +1,4 @@
From 507955f9951ca2bc6aaee7f92925260447d39e37 Mon Sep 17 00:00:00 2001
From 4b35ef1339fb251cce0fd413768b5b21a43d0d93 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions

View File

@ -1,4 +1,4 @@
From 2dc0ec5aba05142b29a14e5a0c0992f66ff29c16 Mon Sep 17 00:00:00 2001
From f806016da3aaa600066cecdf0fca9f0ba867a53d Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 25 Oct 2016 12:34:41 -0400
Subject: [PATCH] Validate that chat messages are non-blank

View File

@ -1,4 +1,4 @@
From b20d2301788798240969e94c4f3c984e947079d4 Mon Sep 17 00:00:00 2001
From 8aed545ad60c51be4fd1693292c0a6717c101508 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Mon, 25 Apr 2016 23:46:00 -0700
Subject: [PATCH] Reduce the overhead of lots and lots of teams with the same

View File

@ -1,4 +1,4 @@
From 211c8c54e76909748e44948a1773bc2b4014ad5c Mon Sep 17 00:00:00 2001
From 181583243693c944086d1c18709c55d116b2c300 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Wed, 6 Apr 2016 23:46:00 -0700
Subject: [PATCH] Better debug checks

View File

@ -1,4 +1,4 @@
From ecdbe7b96aa259fd833a4801fe05562f66004b72 Mon Sep 17 00:00:00 2001
From 8056f447e7f0ac8bc9f660a2b1e34918d5c6f750 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api.
@ -143,6 +143,19 @@ index 967a1b2a..08aa6981 100644
private Configuration getSectionFor(String path)
{
int index = path.indexOf( SEPARATOR );
diff --git a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
index 36da83e2..c9ca6874 100644
--- a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
+++ b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
@@ -78,7 +78,7 @@ public class CommandServer extends Command implements TabExecutor
@Override
public Iterable<String> onTabComplete(final CommandSender sender, final String[] args)
{
- return ( args.length > 1 ) ? Collections.EMPTY_LIST : Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServers().values(), new Predicate<ServerInfo>()
+ return ( args.length > 1 ) ? Collections.EMPTY_LIST : Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServersCopy().values(), new Predicate<ServerInfo>() // Waterfall: use #getServersCopy()
{
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase();
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 9ce19d9a..69e5dc33 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java

View File

@ -1,4 +1,4 @@
From dc35516f2ab630393ddc070d5c16ed1128333afd Mon Sep 17 00:00:00 2001
From f6c48a227b9dc70d97ee9c22f54d0481913535fb Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Mon, 6 Jun 2016 13:36:10 -0600
Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state

View File

@ -1,4 +1,4 @@
From 50660b87bc2e041bfeb4b0b81874290ea90ba559 Mon Sep 17 00:00:00 2001
From 4f2868a5e5839988b6a17d3204966c9863fb703e Mon Sep 17 00:00:00 2001
From: Nathan Poirier <nathan@poirier.io>
Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent

View File

@ -1,4 +1,4 @@
From 835a09518601e80cffdd93e0c0b8b0357b84bca4 Mon Sep 17 00:00:00 2001
From a3d9daab37b857023cf33922887536fad4137b5f Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response

View File

@ -1,4 +1,4 @@
From e82a5e7adcf939a04b385a41da4b5e3cb0abfa6b Mon Sep 17 00:00:00 2001
From c5e2f8f7f2c9ef65783ce344888d309f70a9d528 Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods

View File

@ -1,4 +1,4 @@
From c025409646f2873e60b1ae7742c2ebae9581a57c Mon Sep 17 00:00:00 2001
From 99e0f78518b8579d4b8bc783f3ec1384af8e8db3 Mon Sep 17 00:00:00 2001
From: minecrafter <unknown@unknown>
Date: Sun, 3 Jul 2016 04:03:21 -0400
Subject: [PATCH] Proxy query event

View File

@ -1,4 +1,4 @@
From 40949c820147e2bd6647f1e8ae40e9f39fd9a367 Mon Sep 17 00:00:00 2001
From 046d135d0187f3d739afe48ff92eea47df55541e Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 4 Aug 2016 19:30:49 -0700
Subject: [PATCH] Dump the raw hex of a packet on a decoding error

View File

@ -1,4 +1,4 @@
From f735a50c4d812b819618d61c75bcea249220c3cd Mon Sep 17 00:00:00 2001
From 383d5fbd50068ab7f5c76cb2f52ba827a44dd395 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9

View File

@ -1,4 +1,4 @@
From e79a42a3429951458eea1126e62bdcb2ec29303a Mon Sep 17 00:00:00 2001
From 1db05e22c7bea406885eae04e9df5f1f97407c10 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 03:13:03 -0500
Subject: [PATCH] Optionally use async Netty DNS resolver

View File

@ -1,4 +1,4 @@
From 9ab57ece30e76377efe262f561952ece14506804 Mon Sep 17 00:00:00 2001
From cfeb2afa090f3486d98dd8a83120756acb97e884 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 04:07:26 -0500
Subject: [PATCH] Security enhancements for EncryptionUtil

View File

@ -1,4 +1,4 @@
From c9fd051a1018a718760b771735c7ed64faa701e9 Mon Sep 17 00:00:00 2001
From 517a7f918b4e17e5512e6b36ccb3d86a33c37b49 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sat, 10 Jun 2017 20:56:02 +0100
Subject: [PATCH] Improve outdated build message

View File

@ -1,4 +1,4 @@
From 41d65ce39cfdb9e20ddfe276641418c86b505450 Mon Sep 17 00:00:00 2001
From 01540488bfb93de14211d9b22f8cdfc2ac62dee5 Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Mon, 17 Jul 2017 20:24:17 +0100
Subject: [PATCH] Fix some forge plugin message packets not being forwarded

View File

@ -1,4 +1,4 @@
From 91a0c2194ec3786fcfe4699814eef1972432acf4 Mon Sep 17 00:00:00 2001
From f29ff52488dfaa77e80afb8e7544500edb6d48d2 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -249,7 +249,7 @@ index 00000000..d4a81199
+ </Loggers>
+</Configuration>
diff --git a/pom.xml b/pom.xml
index ecc35560..576944c3 100644
index 8ab84091..d8c19a30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@

View File

@ -1,4 +1,4 @@
From 458ea63563cfe1a09b3f2fb7193cb12df57fa2a2 Mon Sep 17 00:00:00 2001
From cc1216e4ae16ecc16b06b848ddea7c1a15834b8b Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Fri, 22 Sep 2017 13:07:31 +0200
Subject: [PATCH] Handle plugin prefixes using Log4J

View File

@ -1,4 +1,4 @@
From 8b0c27e95a92497a4f2df71a6167bcdd9790632e Mon Sep 17 00:00:00 2001
From 8d7700a5ef39cf148965e355adafccd27a02900a Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging

View File

@ -1,4 +1,4 @@
From 07548816209cf5ceb6eb767fc3ab4220af59f9e8 Mon Sep 17 00:00:00 2001
From ceb1ccc36d326e4d61145332324858013475e9cd Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Sun, 24 Sep 2017 12:06:49 +0200
Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord

View File

@ -1,4 +1,4 @@
From e8a993f7904514b1080e7432825c3295c780a3c8 Mon Sep 17 00:00:00 2001
From a4da18e359af4cdfda067dfbc741bf84d0e0dd76 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Tue, 26 Sep 2017 18:59:37 +0200
Subject: [PATCH] Add console command completion