Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-28 13:15:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2018-03-20 20:24:14 +00:00
parent 804cb0dd79
commit 5882e0a157
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit d7eef6ff2ec249581fb3f2e0093a5c3a54d818a4 Subproject commit 272258cf5a22602fda6b9030fa91524d90511c11

10
BungeeCord-Patches/0019-Add-basic-support-for-configurable-tab-complete-thro.patch
View File

@ -1,4 +1,4 @@
From be7b04004bf0e9b284f22b38328ce96ef35d6708 Mon Sep 17 00:00:00 2001 From f01d605e461267209d8008ae203ac107a6e82679 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
@ -64,10 +64,10 @@ index 056b8040..e56d3591 100644
+ } + }
} }
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 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 bb43810b..5f5f00ca 100644 index 19a52458..ccdeaed1 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -32,6 +32,8 @@ public class UpstreamBridge extends PacketHandler @@ -33,6 +33,8 @@ public class UpstreamBridge extends PacketHandler
private final ProxyServer bungee; private final ProxyServer bungee;
private final UserConnection con; private final UserConnection con;
@ -76,7 +76,7 @@ index bb43810b..5f5f00ca 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con) public UpstreamBridge(ProxyServer bungee, UserConnection con)
{ {
this.bungee = bungee; this.bungee = bungee;
@@ -148,6 +150,16 @@ public class UpstreamBridge extends PacketHandler @@ -149,6 +151,16 @@ public class UpstreamBridge extends PacketHandler
@Override @Override
public void handle(TabCompleteRequest tabComplete) throws Exception public void handle(TabCompleteRequest tabComplete) throws Exception
{ {
@ -94,5 +94,5 @@ index bb43810b..5f5f00ca 100644
if ( tabComplete.getCursor().startsWith( "/" ) ) if ( tabComplete.getCursor().startsWith( "/" ) )
-- --
2.14.1 2.16.1

12
BungeeCord-Patches/0021-Optional-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 46db972c5d1f48f5e444612d75cf519523ef11ff Mon Sep 17 00:00:00 2001 From 9ef8e269ec4e0905e4a47ca654c92f05fd2f95cf 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.
@ -73,7 +73,7 @@ index b29ee7c5..79e88cc5 100644
} }
} }
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 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 19fd3b3b..dcd6924d 100644 index 5829dda9..02284f16 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -510,6 +510,6 @@ public class DownstreamBridge extends PacketHandler @@ -510,6 +510,6 @@ public class DownstreamBridge extends PacketHandler
@ -85,7 +85,7 @@ index 19fd3b3b..dcd6924d 100644
} }
} }
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 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 2f0cd28d..7ab4d042 100644 index 1824b97f..5f0801f4 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -281,19 +281,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -281,19 +281,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -122,10 +122,10 @@ index 2f0cd28d..7ab4d042 100644
@Override @Override
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 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 5f5f00ca..4665f821 100644 index ccdeaed1..742ff503 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -233,6 +233,6 @@ public class UpstreamBridge extends PacketHandler @@ -237,6 +237,6 @@ public class UpstreamBridge extends PacketHandler
@Override @Override
public String toString() public String toString()
{ {
@ -134,5 +134,5 @@ index 5f5f00ca..4665f821 100644
} }
} }
-- --
2.14.1 2.16.1

8
BungeeCord-Patches/0025-Validate-that-chat-messages-are-non-blank.patch
View File

@ -1,4 +1,4 @@
From f806016da3aaa600066cecdf0fca9f0ba867a53d Mon Sep 17 00:00:00 2001 From 438e3698ce253ec55958ceb5bc5e91b94aea6f2e 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
@ -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 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 4665f821..3000a567 100644 index 742ff503..b2513e93 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/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 @@ @@ -1,6 +1,7 @@
@ -44,7 +44,7 @@ index 4665f821..3000a567 100644
import io.netty.channel.Channel; import io.netty.channel.Channel;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -134,6 +135,7 @@ public class UpstreamBridge extends PacketHandler @@ -135,6 +136,7 @@ public class UpstreamBridge extends PacketHandler
{ {
int maxLength = ( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_11 ) ? 256 : 100; int maxLength = ( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_11 ) ? 256 : 100;
Preconditions.checkArgument( chat.getMessage().length() <= maxLength, "Chat message too long" ); // Mojang limit, check on updates Preconditions.checkArgument( chat.getMessage().length() <= maxLength, "Chat message too long" ); // Mojang limit, check on updates
@ -53,5 +53,5 @@ index 4665f821..3000a567 100644
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() ); ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() ) if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
-- --
2.14.1 2.16.1