mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-28 13:15:31 +01:00
move up Fixup ProtocolConstants to waterfall
This patch contains a trivial formatting fix, while while somewhat pointless, I decided to keep, the main advantage is in the util helpers which will aim to keep code cleaner (I've wished for this to be included in waterfall for a while, and given future work, I feel now is a good time to shift it over)
This commit is contained in:
parent
38390d14d0
commit
1c8ea44393
40
BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch
Normal file
40
BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch
Normal file
@ -0,0 +1,40 @@
|
||||
From 2d75ec272a93dc6da8d56876fc5545b438c185ee Mon Sep 17 00:00:00 2001
|
||||
From: Troy Frew <fuzzy_bot@arenaga.me>
|
||||
Date: Tue, 15 Nov 2016 09:07:51 -0500
|
||||
Subject: [PATCH] Fixup ProtocolConstants
|
||||
|
||||
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
|
||||
index 2cc86349..d9a3c7e5 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
|
||||
@@ -28,7 +28,8 @@ public class ProtocolConstants
|
||||
"1.12.x",
|
||||
"1.13.x"
|
||||
);
|
||||
- public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList( ProtocolConstants.MINECRAFT_1_8,
|
||||
+ public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
|
||||
+ ProtocolConstants.MINECRAFT_1_8,
|
||||
ProtocolConstants.MINECRAFT_1_9,
|
||||
ProtocolConstants.MINECRAFT_1_9_1,
|
||||
ProtocolConstants.MINECRAFT_1_9_2,
|
||||
@@ -44,6 +45,16 @@ public class ProtocolConstants
|
||||
ProtocolConstants.MINECRAFT_1_13_2
|
||||
);
|
||||
|
||||
+ public static final boolean isBeforeOrEq(int before, int other)
|
||||
+ {
|
||||
+ return before <= other;
|
||||
+ }
|
||||
+
|
||||
+ public static final boolean isAfterOrEq(int after, int other)
|
||||
+ {
|
||||
+ return after >= other;
|
||||
+ }
|
||||
+
|
||||
public enum Direction
|
||||
{
|
||||
|
||||
--
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From eda3a0cf78e1d41ea4aeb3d09e052314b8a6be5d Mon Sep 17 00:00:00 2001
|
||||
From 2ccf865f350de60caee4370d653329f31b75cd1a 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
|
||||
@ -19,5 +19,5 @@ index 96d0a71d..bac6b1b0 100644
|
||||
@Override
|
||||
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From e7e565face505edda19fc4f24b19b51f648b9e65 Mon Sep 17 00:00:00 2001
|
||||
From e53d8ec67e3c51e7b0f4efe1ce0bbf23c7292433 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
|
||||
@ -86,5 +86,5 @@ index ffee7062..09486b4a 100644
|
||||
{
|
||||
@Override
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6e372e8642d47083dc0af12366e83f89a6443534 Mon Sep 17 00:00:00 2001
|
||||
From 4944839d0056cf874ee7906bdc2e04451a7d0939 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
|
||||
@ -53,5 +53,5 @@ index db8aa4be..9258d7dd 100644
|
||||
return load( reader, defaults );
|
||||
}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6c9a2c2cbbba3df1c0b01721e2d92581c26744c4 Mon Sep 17 00:00:00 2001
|
||||
From c564a733d0c0425b5d50255ab1401c08c0e62f04 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
|
||||
@ -271,5 +271,5 @@ index d4fadcf6..0e8041f8 100644
|
||||
|
||||
@Override
|
||||
--
|
||||
2.18.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 5b57b9f2aff8dfe8f9d8ca28726488138f4b8a09 Mon Sep 17 00:00:00 2001
|
||||
From eb9f4837f090b83f109bfe1f33e8de123fbcdaad Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Naylor <git@drnaylor.co.uk>
|
||||
Date: Tue, 25 Oct 2016 12:23:07 -0400
|
||||
Subject: [PATCH] Add support for FML with IP Forwarding enabled
|
||||
@ -67,7 +67,7 @@ index 29245c94..ee8cdff2 100644
|
||||
}
|
||||
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
index 14dc52f5..5fd5ce80 100644
|
||||
index 63742805..99cd19a1 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
@@ -166,8 +166,12 @@ public final class UserConnection implements ProxiedPlayer
|
||||
@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
|
||||
* The FML 1.8 handshake token.
|
||||
*/
|
||||
--
|
||||
2.18.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From dfb97309650f32fc56b84f26794df8d777997aa1 Mon Sep 17 00:00:00 2001
|
||||
From fde78fb9ec9aab582987660d5bd520110e10304d Mon Sep 17 00:00:00 2001
|
||||
From: Tux <write@imaginarycode.com>
|
||||
Date: Thu, 19 May 2016 17:36:31 -0600
|
||||
Subject: [PATCH] Better unit tests for Chat API
|
||||
@ -53,5 +53,5 @@ index 2391c22f..8397db2d 100644
|
||||
+ }
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 4a77a0c6b9df61ce8c95f244051853f4310c81b0 Mon Sep 17 00:00:00 2001
|
||||
From 9a42e4967bbf370697c7ab0b91879f4af53f2dc8 Mon Sep 17 00:00:00 2001
|
||||
From: Techcable <Techcable@outlook.com>
|
||||
Date: Thu, 28 Jan 2016 15:13:29 -0700
|
||||
Subject: [PATCH] Allow removing servers or changing addresses on reload
|
||||
@ -72,5 +72,5 @@ index 1c585e60..bdb012c3 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d3c6dfe50626400638941023153187a4b993b019 Mon Sep 17 00:00:00 2001
|
||||
From 23959a2a008f6f3bf3aed289016debdecfd293be Mon Sep 17 00:00:00 2001
|
||||
From: Harry <me@harry5573.uk>
|
||||
Date: Sun, 24 Jan 2016 15:13:29 -0700
|
||||
Subject: [PATCH] Enable TCP_NODELAY.
|
||||
@ -18,5 +18,5 @@ index 09486b4a..41330ec2 100644
|
||||
ch.config().setWriteBufferWaterMark( MARK );
|
||||
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 85e2919d0c335b504c6aad7fd3710293d825b13b Mon Sep 17 00:00:00 2001
|
||||
From c5f4b70c8a48babd30dd0ccefe0e2277fe327fb4 Mon Sep 17 00:00:00 2001
|
||||
From: Tux <write@imaginarycode.com>
|
||||
Date: Tue, 19 Jan 2016 15:13:29 -0700
|
||||
Subject: [PATCH] Micro-optimizations
|
||||
@ -64,5 +64,5 @@ index d4c58098..30f8a7df 100644
|
||||
String subChannel = in.readUTF();
|
||||
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3df6fbcb505e1b3b136e4708aadf6ed515bda9b6 Mon Sep 17 00:00:00 2001
|
||||
From 8aeac5bd2bd635e4ec33db84f59b1159b6c3c391 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
|
@ -1,4 +1,4 @@
|
||||
From 896b13140d424a1ec5d7aa882c9f3c479716e3d5 Mon Sep 17 00:00:00 2001
|
||||
From 133e8a1b38fffff23496691d3e64ce59db8b7bbc 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 89c8f48f..9756c09c 100644
|
||||
|
||||
@Override
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 5c4455d7f45ae071ab626b3c40dfe4bf1c28a993 Mon Sep 17 00:00:00 2001
|
||||
From fbc6e7f7ab5881b789dd729657c84e5f2f902e8f 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
|
||||
@ -103,5 +103,5 @@ index 9666e7a2..8c4f999c 100644
|
||||
|
||||
if ( tabComplete.getCursor().startsWith( "/" ) )
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f54312b02382629575ad5dbc2fb00fe4f89b4604 Mon Sep 17 00:00:00 2001
|
||||
From 8a3803baf50aa378e45427c5d631782ce8123a43 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.
|
||||
@ -130,5 +130,5 @@ index 8c4f999c..78b39fef 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 34d378cba51952d0be676eede8bab2bd1ee7fb35 Mon Sep 17 00:00:00 2001
|
||||
From 9eb7c9469fc69ff6c020baa704f58c97a2af9b9f 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
|
||||
@ -29,5 +29,5 @@ index cd240460..aa2d465e 100644
|
||||
disconnect( "" );
|
||||
}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From bf87adff567326af8fb38fbe5f8dbd8f5575068f Mon Sep 17 00:00:00 2001
|
||||
From 594e46581ad93aebc8a12857247a35a9a75dddb4 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 9756c09c..648cd273 100644
|
||||
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
|
||||
.remoteAddress( getAddress() )
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 0033c8d2a08a7f23abf23ce5519a1a25e152644d Mon Sep 17 00:00:00 2001
|
||||
From 7fe4a7256f09d59aedc03966dc2057098680c6e4 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 71df1fd5..4882b8ed 100644
|
||||
if ( compressionThreshold == -1 )
|
||||
{
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From fe63aa2e77ed7922cc569a17bd7688d85edf8498 Mon Sep 17 00:00:00 2001
|
||||
From 4a2392598c81d86ff9bb7b5e568cf240ad95935e 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
|
||||
@ -33,7 +33,7 @@ index 00000000..940ad806
|
||||
+ }
|
||||
+}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
index 20b3975a..7129f5e7 100644
|
||||
index 78b39fef..e1be7cce 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
@@ -1,6 +1,7 @@
|
||||
@ -53,5 +53,5 @@ index 20b3975a..7129f5e7 100644
|
||||
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
|
||||
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 19ea87698830df73118bb9c1abae7c3cc0ddf77b Mon Sep 17 00:00:00 2001
|
||||
From c2e3eb2835f65d9e8e80c1b6949d27660d6bc7e7 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
|
||||
@ -267,5 +267,5 @@ index 00000000..5aa306a1
|
||||
+
|
||||
+}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a18ebcc6c9cbb1e27a759d6f8a51861016665595 Mon Sep 17 00:00:00 2001
|
||||
From f5d5d0c3e84b58853c7c906c99134b5ea89dd6be 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.
|
||||
@ -8,7 +8,7 @@ The provided methods will not move a player if a server is removed or the server
|
||||
Thanks to Overcast for the idea
|
||||
|
||||
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
|
||||
index 7fd5c8e5..dcd46f4a 100644
|
||||
index 72f35bd6..78519227 100644
|
||||
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
|
||||
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
|
||||
@@ -32,9 +32,83 @@ public interface ProxyConfig
|
||||
@ -298,5 +298,5 @@ index bdb012c3..cbbd8d34 100644
|
||||
+ // Waterfall end
|
||||
}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From c089b4f064ac4bece17323bf2e715cec1500dc55 Mon Sep 17 00:00:00 2001
|
||||
From eb80d2fbc538e46b9dae8431f582ce2c73d4c958 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
|
||||
@ -18,5 +18,5 @@ index aa2d465e..45cd5237 100644
|
||||
ch.delayedClose( new Kick( ComponentSerializer.toString( reason ) ) );
|
||||
} else
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 9e607e607838e80d222e106c7610f6ed6732ac4f Mon Sep 17 00:00:00 2001
|
||||
From 69ed7d98ee77a01aec56aa398ef79bb944d0fb91 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
|
||||
@ -146,5 +146,5 @@ index ce8da75d..4743af1d 100644
|
||||
{
|
||||
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 97f51be47197095ec5d0b23d01ab5912597a0ed7 Mon Sep 17 00:00:00 2001
|
||||
From b08ce33715814a6afd88323c8351dcab3fe5b39d 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
|
||||
@ -81,5 +81,5 @@ index 07eeea16..595b7375 100644
|
||||
|
||||
@Override
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 1eb620e3305682150b973c3499691a7ae0193cfc Mon Sep 17 00:00:00 2001
|
||||
From dd3d26f55d4271de7f08dea122985c3bb1b5a609 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
|
||||
@ -109,5 +109,5 @@ index 6146cb44..d1d3142e 100644
|
||||
{
|
||||
disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From fd5287e0f251e5c990647e26959c7b81df8145fc Mon Sep 17 00:00:00 2001
|
||||
From 6b184479446746c1cfc61a45e16f44445829aa3b 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
|
||||
@ -214,5 +214,5 @@ index 79d6886a..a72cfd92 100644
|
||||
} else
|
||||
{
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 96aa31c0c0c0b31c97579f5db486b32d77ecd382 Mon Sep 17 00:00:00 2001
|
||||
From 78181ca9907f9eb85163a1ab4f851aad37c37f49 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 5b32effe..9e9ea49c 100644
|
||||
{
|
||||
if ( slice != null )
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From e20e038ca67510970e7dc7f5d7e5d575cc84999f Mon Sep 17 00:00:00 2001
|
||||
From a9838cfb9f29641112d334f3f625d107b30aa5d0 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
|
||||
@ -32,7 +32,7 @@ index 93f324e2..0e81b43c 100644
|
||||
+ // Waterfall end
|
||||
}
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
|
||||
index 93e81266..c3c46399 100644
|
||||
index acd28a94..cc863d9b 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
|
||||
@@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat;
|
||||
@ -273,5 +273,5 @@ index 0d683856..c1272da3 100644
|
||||
* Sends the server mod list to the client, or stores it for sending later.
|
||||
*
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 97b134ad0ba83da9fc5539f873b5dbbeaa013400 Mon Sep 17 00:00:00 2001
|
||||
From 23897094cb77e7bfe9c4e826a49e3ff2ae5e20dd 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
|
||||
@ -22,7 +22,7 @@ index 34d7e2cb..47d4ab36 100644
|
||||
|
||||
/**
|
||||
diff --git a/proxy/pom.xml b/proxy/pom.xml
|
||||
index 841f014e..2efeaa9e 100644
|
||||
index b45cdba0..3542b6da 100644
|
||||
--- a/proxy/pom.xml
|
||||
+++ b/proxy/pom.xml
|
||||
@@ -41,6 +41,14 @@
|
||||
@ -181,5 +181,5 @@ index 41330ec2..c26fc55b 100644
|
||||
return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
|
||||
}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From c13507d54f34d80d8b9be247d93dd2dce4fd7a69 Mon Sep 17 00:00:00 2001
|
||||
From 2db35b7076d87528c16a52c811e65085b84ab0bd 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
|
||||
@ -22,5 +22,5 @@ index 11526c9c..2efe7211 100644
|
||||
Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
|
||||
}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 75c9b9a7e8d4ddd4291a19ad618f1e1be877f188 Mon Sep 17 00:00:00 2001
|
||||
From bf3a6eb156feec9de89fae7c4bce7e530a8e6d59 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
|
||||
@ -55,5 +55,5 @@ index 3fe5ec5f..a0c07874 100644
|
||||
synchronized ( packetQueue )
|
||||
{
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 95bf6d885b4e1604bc9fa3781d3cfa3cdf7f45df Mon Sep 17 00:00:00 2001
|
||||
From d89e83caad7e2663ed8835ef5c8d45121afc4fde Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Fri, 22 Sep 2017 12:46:47 +0200
|
||||
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
|
@ -1,4 +1,4 @@
|
||||
From 51c4576c7c91450cbe7dd1638d6017b6e56ebc75 Mon Sep 17 00:00:00 2001
|
||||
From 5b7ba01b6406965dd3f531427160384cd0bdcd83 Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Fri, 22 Sep 2017 13:07:31 +0200
|
||||
Subject: [PATCH] Handle plugin prefixes using Log4J
|
||||
@ -45,5 +45,5 @@ index 93ce3b14..3b3525f0 100644
|
||||
<TimeBasedTriggeringPolicy />
|
||||
<OnStartupTriggeringPolicy />
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 78ba3b760b6d9700fce0aa6b490265f06f8ceec1 Mon Sep 17 00:00:00 2001
|
||||
From d62c8e7272eb98ab66bf7dc759b1ff3e0a7fe824 Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Fri, 22 Sep 2017 13:15:09 +0200
|
||||
Subject: [PATCH] Allow plugins to use SLF4J for logging
|
||||
@ -39,7 +39,7 @@ index e85b4914..2e5ae4fb 100644
|
||||
* Called when the plugin has just been loaded. Most of the proxy will not
|
||||
* be initialized, so only use it for registering
|
||||
diff --git a/log4j/pom.xml b/log4j/pom.xml
|
||||
index 36fceb93..a085a39c 100644
|
||||
index e27b582f..33f1b659 100644
|
||||
--- a/log4j/pom.xml
|
||||
+++ b/log4j/pom.xml
|
||||
@@ -38,6 +38,12 @@
|
||||
@ -56,5 +56,5 @@ index 36fceb93..a085a39c 100644
|
||||
<groupId>com.lmax</groupId>
|
||||
<artifactId>disruptor</artifactId>
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f6da3e02cecfeb3ea84b205e37ae1f0f6955b685 Mon Sep 17 00:00:00 2001
|
||||
From 3fb13aaf95b4ba17bb87cd054b54fa0b151e712b Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Sun, 24 Sep 2017 12:06:49 +0200
|
||||
Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord
|
||||
@ -47,5 +47,5 @@ index 00000000..6e9c09c5
|
||||
+ </Loggers>
|
||||
+</Configuration>
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 15a2fa23bb78dee5bc42eaf414a8d078f3bcbe9c Mon Sep 17 00:00:00 2001
|
||||
From 723106d47973b5eaec21f6499c7ba75e61cd484b Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Tue, 26 Sep 2017 18:59:37 +0200
|
||||
Subject: [PATCH] Add console command completion
|
||||
@ -102,5 +102,5 @@ index 765d24bc..6cec0b5a 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 69672dc2952d20ba5aa38514e487713b0dace7ea Mon Sep 17 00:00:00 2001
|
||||
From b34a16032901128a9ebfe6a5ab454883b521d488 Mon Sep 17 00:00:00 2001
|
||||
From: phenomax <phenomax@revayd.net>
|
||||
Date: Thu, 10 Aug 2017 18:41:17 +0200
|
||||
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
|
||||
@ -65,5 +65,5 @@ index 45cd5237..c546e7be 100644
|
||||
|
||||
@Override
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 1447245c1b0233eefc07d701007d55a4fc5d24ea Mon Sep 17 00:00:00 2001
|
||||
From 13823f5f24ba50f4d43145ae740b5207933e8716 Mon Sep 17 00:00:00 2001
|
||||
From: Gabriele C <sgdc3.mail@gmail.com>
|
||||
Date: Thu, 8 Feb 2018 19:10:52 +0100
|
||||
Subject: [PATCH] Optionally log InitialHandler connections
|
||||
@ -72,5 +72,5 @@ index c546e7be..8f63e997 100644
|
||||
bungee.getLogger().log( Level.INFO, "{0} has connected", this );
|
||||
}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 087e0fe4fe2617e8096256ab2b42c2dd9aa9ff6b Mon Sep 17 00:00:00 2001
|
||||
From b36df95c6c0854c374215b5992de07cdcf59d059 Mon Sep 17 00:00:00 2001
|
||||
From: Jamie Mansfield <dev@jamierocks.uk>
|
||||
Date: Mon, 28 May 2018 21:43:55 +0100
|
||||
Subject: [PATCH] Forge is a first class citizen
|
||||
@ -31,5 +31,5 @@ index cbbd8d34..2599b579 100644
|
||||
@Synchronized("serversLock") // Waterfall
|
||||
public void load()
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d46df55add6b43e643888128c3776da8f78d63f1 Mon Sep 17 00:00:00 2001
|
||||
From b4606412285ed0352ffc1d482a571b0d5f1acbe9 Mon Sep 17 00:00:00 2001
|
||||
From: Shane Freeder <theboyetronic@gmail.com>
|
||||
Date: Fri, 12 Oct 2018 14:28:52 +0100
|
||||
Subject: [PATCH] Add Configuration to allow empty packets
|
Loading…
Reference in New Issue
Block a user