Drop redundant patches for JUL logger

Since Waterfall is now using Log4J for logging, these patches no
longer have any effect.
This commit is contained in:
Minecrell 2017-10-08 20:57:57 +02:00 committed by Jamie Mansfield
parent d3dc2d3748
commit e1553a3f25
39 changed files with 61 additions and 106 deletions

View File

@ -1,22 +0,0 @@
From b9149ce0beebd9174c06dc7ac6eb3b44b0c3420a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 11 Sep 2015 23:50:52 -0400
Subject: [PATCH] Allow configuration of the log file path/filename
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 66463ec5..2b17e7a7 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -211,7 +211,7 @@ public class BungeeCord extends ProxyServer
consoleReader = new ConsoleReader();
consoleReader.setExpandEvents( false );
- logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader );
+ logger = new BungeeLogger( "BungeeCord", System.getProperty("bungee.log-file", "proxy.log"), consoleReader );
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
--
2.13.4

View File

@ -1,4 +1,4 @@
From 4e46f524eabfc3189e11bca8bd98c3a83093c0a4 Mon Sep 17 00:00:00 2001 From f215e5c743dcd9dbb47bb6188367188b8cf87500 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com> From: kamcio96 <k.nadworski@icloud.com>
Date: Sat, 21 May 2016 17:17:36 -0600 Date: Sat, 21 May 2016 17:17:36 -0600
Subject: [PATCH] Fix unicode characters in configuration files Subject: [PATCH] Fix unicode characters in configuration files
@ -53,5 +53,5 @@ index db8aa4be..9258d7dd 100644
return load( reader, defaults ); return load( reader, defaults );
} }
-- --
2.13.4 2.14.1

View File

@ -1,4 +1,4 @@
From eaa76ca824b8557870d7a935def28a688678d314 Mon Sep 17 00:00:00 2001 From 507955f9951ca2bc6aaee7f92925260447d39e37 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700 Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions Subject: [PATCH] Optimize uuid conversions
@ -271,5 +271,5 @@ index e596f822..2f0cd28d 100644
@Override @Override
-- --
2.13.4 2.14.1

View File

@ -1,4 +1,4 @@
From 3e32503a298ddc706ccc936603688f7fcfd11ab7 Mon Sep 17 00:00:00 2001 From 49dbe167d0972e44cf1011adb32539b51326886d Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk> From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400 Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled Subject: [PATCH] Add support for FML with IP Forwarding enabled

View File

@ -1,4 +1,4 @@
From f89cb687f56c14d7d49a0bd8bfbb1a62fbcbbadf Mon Sep 17 00:00:00 2001 From 7415b8f4ad505083d9dc0daa08dbc9d4601af26e Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 17:36:31 -0600 Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API Subject: [PATCH] Better unit tests for Chat API

View File

@ -1,11 +1,11 @@
From 9d898013e9f35678e2a42c1c7c56db9363bc3975 Mon Sep 17 00:00:00 2001 From 105c216b798e10799a86226f72e5d0e7597e1c1a Mon Sep 17 00:00:00 2001
From: Iceee <andrew@optic.tv> From: Iceee <andrew@optic.tv>
Date: Mon, 6 Jul 2015 18:59:29 -0500 Date: Mon, 6 Jul 2015 18:59:29 -0500
Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java 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 2b17e7a7..34e3c3e3 100644 index 0d7d1adf..c03941ed 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -320,6 +320,8 @@ public class BungeeCord extends ProxyServer @@ -320,6 +320,8 @@ public class BungeeCord extends ProxyServer
@ -18,5 +18,5 @@ index 2b17e7a7..34e3c3e3 100644
.childHandler( PipelineUtils.SERVER_CHILD ) .childHandler( PipelineUtils.SERVER_CHILD )
.group( eventLoops ) .group( eventLoops )
-- --
2.13.4 2.14.1

View File

@ -1,4 +1,4 @@
From f2c85421fa39e5506a48d37647dbf416bd1b4ecd Mon Sep 17 00:00:00 2001 From c581406478bbbb2461aa5fcad41c1bf6b0bc30a0 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Thu, 28 Jan 2016 15:13:29 -0700 Date: Thu, 28 Jan 2016 15:13:29 -0700
Subject: [PATCH] Allow removing servers or changing addresses on reload Subject: [PATCH] Allow removing servers or changing addresses on reload
@ -72,5 +72,5 @@ index 4a55c0e2..d131c02c 100644
} }
} }
-- --
2.13.4 2.14.1

View File

@ -1,4 +1,4 @@
From 19a82b71af00438f105225ef33ba602c03980c37 Mon Sep 17 00:00:00 2001 From 9f940798b57cbaf8f80559892380a85fc27a1395 Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk> From: Harry <me@harry5573.uk>
Date: Wed, 24 Feb 2016 17:16:23 +0000 Date: Wed, 24 Feb 2016 17:16:23 +0000
Subject: [PATCH] Enable TCP_NODELAY. Subject: [PATCH] Enable TCP_NODELAY.
@ -6,7 +6,7 @@ Subject: [PATCH] Enable TCP_NODELAY.
This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance. This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance.
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 9d6a1013..5eeab8b5 100644 index be9685b9..b0bbc1d7 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -133,6 +133,7 @@ public class PipelineUtils @@ -133,6 +133,7 @@ public class PipelineUtils

View File

@ -1,4 +1,4 @@
From 86cf116e41ffadfd0946248948aaf0f37908034e Mon Sep 17 00:00:00 2001 From 5abce36d076e7384cfac4a0659d3d95e8dc1d05c Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 18:05:33 -0600 Date: Thu, 19 May 2016 18:05:33 -0600
Subject: [PATCH] Micro-optimizations Subject: [PATCH] Micro-optimizations
@ -31,7 +31,7 @@ index 71a5a158..520ee315 100644
if ( split.length == 0 ) if ( split.length == 0 )
{ {
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java 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 36af60a9..a3a16d23 100644 index c03941ed..226af98b 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -493,7 +493,9 @@ public class BungeeCord extends ProxyServer @@ -493,7 +493,9 @@ public class BungeeCord extends ProxyServer

View File

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

View File

@ -1,11 +1,11 @@
From 53a08e2982a2f731a9b62f940853139e8cb93ae6 Mon Sep 17 00:00:00 2001 From dbd8dc11b91da5743cca7945485b3e76cacdeb55 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Fri, 12 Feb 2016 23:55:53 -0500 Date: Fri, 12 Feb 2016 23:55:53 -0500
Subject: [PATCH] Resolve sendData() deadlocks Subject: [PATCH] Resolve sendData() deadlocks
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
index 1dd0aeb..bc56d4f 100644 index 1dd0aeba..bc56d4f3 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
@@ -101,19 +101,22 @@ public class BungeeServerInfo implements ServerInfo @@ -101,19 +101,22 @@ public class BungeeServerInfo implements ServerInfo
@ -43,5 +43,5 @@ index 1dd0aeb..bc56d4f 100644
@Override @Override
-- --
2.7.4 2.14.1

View File

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

View File

@ -1,4 +1,4 @@
From 113e835fa24c514385912985cc24cc5b3eca5ed9 Mon Sep 17 00:00:00 2001 From cd05bb628606c9a86ce649ea90d1ceb198d1f21d Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk> From: Harry <me@harry5573.uk>
Date: Tue, 26 Jan 2016 01:01:57 +0000 Date: Tue, 26 Jan 2016 01:01:57 +0000
Subject: [PATCH] Don't create a new KickStringWriter for each new connection. Subject: [PATCH] Don't create a new KickStringWriter for each new connection.
@ -21,7 +21,7 @@ index eda9571e..e5275c76 100644
{ {
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 5eeab8b5..81927f7f 100644 index b0bbc1d7..0cad5c89 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -56,7 +56,7 @@ public class PipelineUtils @@ -56,7 +56,7 @@ public class PipelineUtils

View File

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

View File

@ -1,4 +1,4 @@
From 804e627d64e94f04491b135be966febdc2161074 Mon Sep 17 00:00:00 2001 From 7d3827b6b64dacf956782ac40a0897f065f05f8c Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Sun, 7 Feb 2016 00:01:19 -0700 Date: Sun, 7 Feb 2016 00:01:19 -0700
Subject: [PATCH] Add a property to accept invalid ping packets Subject: [PATCH] Add a property to accept invalid ping packets
@ -29,5 +29,5 @@ index 7ab4d042..bf450f98 100644
disconnect( "" ); disconnect( "" );
} }
-- --
2.13.4 2.14.1

View File

@ -1,23 +0,0 @@
From 1dd8fe7f8fcef4f63a0c3c8f78fdf426b4c57c71 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
files
diff --git a/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java b/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java
index 9598fff3..2a2e0ed2 100644
--- a/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java
+++ b/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java
@@ -27,7 +27,7 @@ public class BungeeLogger extends Logger
try
{
- FileHandler fileHandler = new FileHandler( filePattern, 1 << 24, 8, true );
+ FileHandler fileHandler = new FileHandler( filePattern, 1 << 23, 8, false );
fileHandler.setFormatter( formatter );
addHandler( fileHandler );
--
2.13.4

View File

@ -1,4 +1,4 @@
From 49b5da0be5404cae435955cddd3792845fcc5b24 Mon Sep 17 00:00:00 2001 From 4596ac8317ab8925e4576e9cbdd05165a01dbbdf Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com> From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700 Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group. 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. 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 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 a3a16d23..952a1fe8 100644 index 226af98b..9ce19d9a 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -110,7 +110,7 @@ public class BungeeCord extends ProxyServer @@ -110,7 +110,7 @@ public class BungeeCord extends ProxyServer
@ -83,5 +83,5 @@ index bc56d4f3..efcba311 100644
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
.remoteAddress( getAddress() ) .remoteAddress( getAddress() )
-- --
2.13.4 2.14.1

View File

@ -1,4 +1,4 @@
From e9acac76a7fb0e3a81951e2b51377d921a3feeb2 Mon Sep 17 00:00:00 2001 From a54483172958d310e8b93bf838c9fc0b6b285674 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Fri, 18 Mar 2016 10:53:24 -0700 Date: Fri, 18 Mar 2016 10:53:24 -0700
Subject: [PATCH] Better Decompression Sanity Subject: [PATCH] Better Decompression Sanity
@ -58,5 +58,5 @@ index 71df1fd5..4882b8ed 100644
if ( compressionThreshold == -1 ) if ( compressionThreshold == -1 )
{ {
-- --
2.13.4 2.14.1

View File

@ -1,4 +1,4 @@
From 27e270db17b1cd9aecc94dc18c94c00e83964ff8 Mon Sep 17 00:00:00 2001 From 051b62a81dccad2c628eedc59bdfbf212a968131 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Tue, 5 Apr 2016 11:00:16 -0700 Date: Tue, 5 Apr 2016 11:00:16 -0700
Subject: [PATCH] Print stack trace when the ByteBuf is not direct. Subject: [PATCH] Print stack trace when the ByteBuf is not direct.
@ -6,7 +6,7 @@ Subject: [PATCH] Print stack trace when the ByteBuf is not direct.
The issue with ByteBufs not being direct should be fixed as of netty 4.1, and stacktraces provide valuable information. The issue with ByteBufs not being direct should be fixed as of netty 4.1, and stacktraces provide valuable information.
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
index 29e54db..6da27fc 100644 index 29e54dba..6da27fcf 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
@@ -51,7 +51,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder @@ -51,7 +51,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
@ -19,5 +19,5 @@ index 29e54db..6da27fc 100644
// See https://github.com/SpigotMC/BungeeCord/issues/1717 // See https://github.com/SpigotMC/BungeeCord/issues/1717
-- --
2.10.0 2.14.1

View File

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

View File

@ -1,4 +1,4 @@
From 983fddb8db3706b766527f8328ed7556dbb58639 Mon Sep 17 00:00:00 2001 From b20d2301788798240969e94c4f3c984e947079d4 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Mon, 25 Apr 2016 23:46:00 -0700 Date: Mon, 25 Apr 2016 23:46:00 -0700
Subject: [PATCH] Reduce the overhead of lots and lots of teams with the same Subject: [PATCH] Reduce the overhead of lots and lots of teams with the same
@ -11,7 +11,7 @@ Uses a sorted array to avoid the overhead of the hashset in a team.
diff --git a/api/src/main/java/io/github/waterfallmc/waterfall/utils/LowMemorySet.java b/api/src/main/java/io/github/waterfallmc/waterfall/utils/LowMemorySet.java diff --git a/api/src/main/java/io/github/waterfallmc/waterfall/utils/LowMemorySet.java b/api/src/main/java/io/github/waterfallmc/waterfall/utils/LowMemorySet.java
new file mode 100644 new file mode 100644
index 0000000..a1b6981 index 00000000..a1b6981e
--- /dev/null --- /dev/null
+++ b/api/src/main/java/io/github/waterfallmc/waterfall/utils/LowMemorySet.java +++ b/api/src/main/java/io/github/waterfallmc/waterfall/utils/LowMemorySet.java
@@ -0,0 +1,151 @@ @@ -0,0 +1,151 @@
@ -167,7 +167,7 @@ index 0000000..a1b6981
+ } + }
+} +}
diff --git a/api/src/main/java/net/md_5/bungee/api/score/Team.java b/api/src/main/java/net/md_5/bungee/api/score/Team.java diff --git a/api/src/main/java/net/md_5/bungee/api/score/Team.java b/api/src/main/java/net/md_5/bungee/api/score/Team.java
index 4166037..f0f019b 100644 index 41660371..f0f019bc 100644
--- a/api/src/main/java/net/md_5/bungee/api/score/Team.java --- a/api/src/main/java/net/md_5/bungee/api/score/Team.java
+++ b/api/src/main/java/net/md_5/bungee/api/score/Team.java +++ b/api/src/main/java/net/md_5/bungee/api/score/Team.java
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
@ -206,7 +206,7 @@ index 4166037..f0f019b 100644
public void removePlayer(String name) public void removePlayer(String name)
diff --git a/api/src/test/java/io/github/waterfallmc/waterfall/utils/LowMemorySetTest.java b/api/src/test/java/io/github/waterfallmc/waterfall/utils/LowMemorySetTest.java diff --git a/api/src/test/java/io/github/waterfallmc/waterfall/utils/LowMemorySetTest.java b/api/src/test/java/io/github/waterfallmc/waterfall/utils/LowMemorySetTest.java
new file mode 100644 new file mode 100644
index 0000000..5aa306a index 00000000..5aa306a1
--- /dev/null --- /dev/null
+++ b/api/src/test/java/io/github/waterfallmc/waterfall/utils/LowMemorySetTest.java +++ b/api/src/test/java/io/github/waterfallmc/waterfall/utils/LowMemorySetTest.java
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
@ -267,5 +267,5 @@ index 0000000..5aa306a
+ +
+} +}
-- --
2.7.4 2.14.1

View File

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

View File

@ -1,4 +1,4 @@
From 1a06b2d13126b3873c8b3395c33db92b5e2d4821 Mon Sep 17 00:00:00 2001 From ecdbe7b96aa259fd833a4801fe05562f66004b72 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200 Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api. Subject: [PATCH] Add dynamic server addition/removal api.
@ -144,7 +144,7 @@ index 967a1b2a..08aa6981 100644
{ {
int index = path.indexOf( SEPARATOR ); 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 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 952a1fe8..cb9a58fc 100644 index 9ce19d9a..69e5dc33 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -569,10 +569,18 @@ public class BungeeCord extends ProxyServer @@ -569,10 +569,18 @@ public class BungeeCord extends ProxyServer

View File

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

View File

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

View File

@ -1,4 +1,4 @@
From 11d3fad8b239a4cc4535dfa7bf58127f99effcef Mon Sep 17 00:00:00 2001 From 835a09518601e80cffdd93e0c0b8b0357b84bca4 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500 Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response Subject: [PATCH] Configurable server version in ping response
@ -59,7 +59,7 @@ index 68f25460..59835815 100644
@Override @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 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 cb9a58fc..f23288f4 100644 index 69e5dc33..b822f95b 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -618,7 +618,7 @@ public class BungeeCord extends ProxyServer @@ -618,7 +618,7 @@ public class BungeeCord extends ProxyServer

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
From d125a3031c8ddab6f9b4dff4e02a366bdea56335 Mon Sep 17 00:00:00 2001 From 91a0c2194ec3786fcfe4699814eef1972432acf4 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net> From: Minecrell <dev@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200 Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -395,7 +395,7 @@ index 00000000..a8a94749
+ +
+} +}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java 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 f23288f4..0a69d24e 100644 index b822f95b..da2904b0 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -45,7 +45,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -45,7 +45,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -446,7 +446,7 @@ index f23288f4..0a69d24e 100644
// When jansi attempts to extract its natives, by default it tries to extract a specific version, // When jansi attempts to extract its natives, by default it tries to extract a specific version,
// using the loading class's implementation version. Normally this works completely fine, // using the loading class's implementation version. Normally this works completely fine,
@@ -214,6 +216,9 @@ public class BungeeCord extends ProxyServer @@ -214,6 +216,9 @@ public class BungeeCord extends ProxyServer
logger = new BungeeLogger( "BungeeCord", System.getProperty("bungee.log-file", "proxy.log"), consoleReader ); logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader );
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) ); System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) ); System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
+ */ + */

View File

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

View File

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

View File

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

View File

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