Remove Event4J patch temporarily

Its apparently the cause of many issues we are currently having
This commit is contained in:
Jamie Mansfield 2016-08-28 21:23:49 +01:00
parent 1e10ca1c09
commit 80bed7979d
26 changed files with 47 additions and 47 deletions

View File

@ -1,4 +1,4 @@
From b41c9aa1aff501ade3c07345a7c224ecbadb29e7 Mon Sep 17 00:00:00 2001
From 4449be9b2eaa7d658987bf8e9f9ee410aab86072 Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Wed, 24 Feb 2016 17:16:23 +0000
Subject: [PATCH] Enable TCP_NODELAY.
@ -18,5 +18,5 @@ index 0ec3f81..c3833f4 100644
ch.pipeline().addLast( TIMEOUT_HANDLER, new ReadTimeoutHandler( BungeeCord.getInstance().config.getTimeout(), TimeUnit.MILLISECONDS ) );
--
2.8.3
2.7.4

View File

@ -1,4 +1,4 @@
From 8fa1a3a9009cc9c7e5a7ff1f7237d70c29b4c2d6 Mon Sep 17 00:00:00 2001
From 45a89cd463d62c74cf093a6ed3261b20027ac3fa Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 18:05:33 -0600
Subject: [PATCH] Micro-optimizations
@ -7,7 +7,7 @@ Subject: [PATCH] Micro-optimizations
- Avoid regex in getLocale() by changing from replaceAll(String, String) to replaceAll(char, char)
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
index 2426bdb..7203d04 100644
index 71a5a15..520ee31 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
@@ -42,7 +42,6 @@ import org.yaml.snakeyaml.introspector.PropertyUtils;
@ -41,5 +41,5 @@ index 018c02e..9881b75 100644
@Override
--
2.8.3
2.7.4

View File

@ -1,4 +1,4 @@
From f117ea4f68ef4f3dac10d17b1bc449d9180e9f4e Mon Sep 17 00:00:00 2001
From e534ca052b2a9d620b1356a32546768ef774212c Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers

View File

@ -1,4 +1,4 @@
From 9064784d8b4fed2f4517b93893c25135ae0b62fc Mon Sep 17 00:00:00 2001
From 53a08e2982a2f731a9b62f940853139e8cb93ae6 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Fri, 12 Feb 2016 23:55:53 -0500
Subject: [PATCH] Resolve sendData() deadlocks
@ -43,5 +43,5 @@ index 1dd0aeb..bc56d4f 100644
@Override
--
2.8.3
2.7.4

View File

@ -1,4 +1,4 @@
From 1e6e4deeec5e5bf1bdee09f83e0b54b65b774f3a Mon Sep 17 00:00:00 2001
From a5ae528bedb519aba7e373c675b257b1a5cff98f Mon Sep 17 00:00:00 2001
From: Johannes Donath <johannesd@torchmind.com>
Date: Sat, 4 Jul 2015 06:31:33 +0200
Subject: [PATCH] Add basic support for configurable tab-complete throttling

View File

@ -1,4 +1,4 @@
From bcf531a5a5eb3ae03d1cc02d72136cd33a3e06ec Mon Sep 17 00:00:00 2001
From 654b0313717a8d0f87a25fb6a0742c97da8360ec Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Tue, 26 Jan 2016 01:01:57 +0000
Subject: [PATCH] Don't create a new KickStringWriter for each new connection.
@ -42,5 +42,5 @@ index c3833f4..aec8251 100644
private static boolean epoll;
--
2.8.3
2.7.4

View File

@ -1,4 +1,4 @@
From b720eba7509edadcb62c935dfabe91e5b16966eb Mon Sep 17 00:00:00 2001
From 7961c01acf03ae869b04fb1e2b410dce9d65d3d7 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Optional server list ping logging.

View File

@ -1,4 +1,4 @@
From 4a151731fbbde0de5a62f1f86ce6e2e35cfbc456 Mon Sep 17 00:00:00 2001
From b5c843ea9c67d816e7fd64f89aced24fa356d3b0 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 14 Feb 2016 01:03:27 -0500
Subject: [PATCH] Reduce max log size to 8MB and don't append to existing log
@ -19,5 +19,5 @@ index 9598fff..2a2e0ed 100644
addHandler( fileHandler );
--
2.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From 1add5dd68f4fb1c33c68e6cd8747e31109ec288c Mon Sep 17 00:00:00 2001
From 38bdf07b0c0a32f7a60586b866bbdd40bc90b5ff Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
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 501d5ba..d3635cd 100644
index 177eefa..323428b 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 501d5ba..d3635cd 100644
disconnect( "" );
}
--
2.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From 7e0e1d30dce6f25daef1c4973d7b91b4b9127c2f Mon Sep 17 00:00:00 2001
From 83671352d2e5739d6506f7a03f111858246eaa89 Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Tue, 23 Jun 2015 21:56:13 +0200
Subject: [PATCH] Ignore incoming chat messages before connecting to the

View File

@ -1,4 +1,4 @@
From 73c3ae42c73d5c711b380e8413dc9bb6abc2245e Mon Sep 17 00:00:00 2001
From 5ba2cf71ab80ed6699273c5124299e03effbbacf Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 15:59:52 -0700
Subject: [PATCH] Improve connection closing, fixing the kick delay.

View File

@ -1,4 +1,4 @@
From 52ef7c8d439549b5eb9b5015264a2c865a6f49c5 Mon Sep 17 00:00:00 2001
From aec40bbdcf92554932e3021e15d3c46fa80a787b Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group.
@ -83,5 +83,5 @@ index bc56d4f..efcba31 100644
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
.remoteAddress( getAddress() )
--
2.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From d76fe372b47a510746e01075097b590c782f7312 Mon Sep 17 00:00:00 2001
From 8d620bc662cc24b386c1b371b94c35242b4d4288 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
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.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From 0a518cb93992ed5256e19aecfb758e1fe430f60f Mon Sep 17 00:00:00 2001
From 87fab161fe33f3609d9080c39eef16b0a6983994 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
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.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From 904621bbf4a75d83aea28840449ee2fffaa69452 Mon Sep 17 00:00:00 2001
From 146c739b7c4024cc57897412d61728f6b239f6e1 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 13 Apr 2016 14:00:40 -0400
Subject: [PATCH] Validate that chat messages are non-blank

View File

@ -1,4 +1,4 @@
From 30b4b1c6421a677f3ad621d55243ddf3fba7937f Mon Sep 17 00:00:00 2001
From 2a55bd0394cf90d74f540e9fb6674e40cabbfa85 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
@ -293,5 +293,5 @@ index 0000000..5aa306a
+
+}
--
2.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From c10db955bcaf7fcee09f851df57779a2e36f98e5 Mon Sep 17 00:00:00 2001
From 254da67ac1c75ad82d4ca1cd2e3708168752625a 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
@ -18,5 +18,5 @@ index db2843f..4decbb2 100644
return protocolData.packetMap.get( packet );
}
--
2.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From 051b34e76129d73c31452e99e508543e688b049f Mon Sep 17 00:00:00 2001
From 4167f0bdc2fc9c5937241e90f1e748d9af493f21 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
@ -6,7 +6,7 @@ Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state
Use a switch statement for checking the state (best practice when you have lots of cases)
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 378231c..132b73d 100644
index 9d139c6..7a4c392 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
@@ -540,10 +540,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -30,5 +30,5 @@ index 378231c..132b73d 100644
}
}
--
2.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From 7159c2b756cd2ee54aa078a1c8298f517350b0f3 Mon Sep 17 00:00:00 2001
From 3de72c025c91dbe7afcd4d39d32d6ea89eae7bae Mon Sep 17 00:00:00 2001
From: DoctorDark <doctordark11@gmail.com>
Date: Sun, 14 Feb 2016 15:54:40 +0000
Subject: [PATCH] Allow the console to tab complete commands
@ -95,5 +95,5 @@ index 0000000..455b078
+ }
+}
--
2.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From 1a12419d5fe6c6e0736accd2ef9768ddf79245a9 Mon Sep 17 00:00:00 2001
From b4fc2b60b905273209619c189b2ba15da1fa3135 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.
@ -126,7 +126,7 @@ index 11c5b68..1c011d0 100644
* Gets the server info of a server.
*
diff --git a/config/src/main/java/net/md_5/bungee/config/Configuration.java b/config/src/main/java/net/md_5/bungee/config/Configuration.java
index 9f3464d..4f359ce 100644
index 967a1b2..08aa698 100644
--- a/config/src/main/java/net/md_5/bungee/config/Configuration.java
+++ b/config/src/main/java/net/md_5/bungee/config/Configuration.java
@@ -44,6 +44,13 @@ public final class Configuration
@ -285,5 +285,5 @@ index db9ebbd..4d16fa3 100644
+ // Waterfall end
}
--
2.8.2
2.7.4

View File

@ -1,4 +1,4 @@
From 991af33158771478cd68737173d4b9cc8e6cb566 Mon Sep 17 00:00:00 2001
From 7e024a412331dd6cc3548a7e7209959019fb707c Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent

View File

@ -1,4 +1,4 @@
From af7ec26e1e2d03942c89b3ec824e1dbb89ef293e Mon Sep 17 00:00:00 2001
From 09aa421d98d08da5f10dd916ebd55a0ae078b47c 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
@ -72,5 +72,5 @@ index 63e1cd9..1d6e535 100644
@Override
--
2.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From 0951d1ef84b66805847d3b990afb7f5a3f049ede Mon Sep 17 00:00:00 2001
From 91ef80137010aac7c0f3ae98813fe0f82bafff2f 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
@ -84,5 +84,5 @@ index 9a13f5c..fead216 100644
// Windows is bugged, multi homed users will just have to live with random connecting IPs
if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() )
--
2.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From 451365fa3e94a851ef9650dc472c6d59e0f1ae0a Mon Sep 17 00:00:00 2001
From 064116f3f75a99954563fcc49595272809dfd2e5 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
@ -215,5 +215,5 @@ index 0be915c..e577b3f 100644
} else
{
--
2.7.4 (Apple Git-66)
2.7.4

View File

@ -1,4 +1,4 @@
From a1fa37e05b144a458cf44632dd337b405df8e04a Mon Sep 17 00:00:00 2001
From 8cfd3fbb4bc7ee1f51cc6b65cf3ddec43c16ed44 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
@ -53,5 +53,5 @@ index 447eaae..17d8444 100644
{
if ( slice != null )
--
2.9.0
2.7.4