Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-01 06:33:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2016-11-14 22:46:55 +00:00
parent 5f58509a04
commit 9fb1a1f574
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 9a4150cd479119e251fa79ef6e0ddd85406cc391 Subproject commit f3e5f34aebc23f07d9605e177ed33c6c2d0af1f7

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

@ -1,4 +1,4 @@
From a3bbfd1ad1fd98f0c26630c14b9f56e6c1593b81 Mon Sep 17 00:00:00 2001 From c4ca03543b96e22be0dd9b466f07811abd7f34c1 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
@ -65,10 +65,10 @@ index 692b83e..c3ae52f 100644
} }
\ No newline at end of file \ No newline at end of file
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 8ccc7c5..4669dee 100644 index 92d1da0..654be21 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
@@ -30,6 +30,8 @@ public class UpstreamBridge extends PacketHandler @@ -31,6 +31,8 @@ public class UpstreamBridge extends PacketHandler
private final ProxyServer bungee; private final ProxyServer bungee;
private final UserConnection con; private final UserConnection con;
@ -77,7 +77,7 @@ index 8ccc7c5..4669dee 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con) public UpstreamBridge(ProxyServer bungee, UserConnection con)
{ {
this.bungee = bungee; this.bungee = bungee;
@@ -126,6 +128,16 @@ public class UpstreamBridge extends PacketHandler @@ -128,6 +130,16 @@ public class UpstreamBridge extends PacketHandler
@Override @Override
public void handle(TabCompleteRequest tabComplete) throws Exception public void handle(TabCompleteRequest tabComplete) throws Exception
{ {
@ -95,5 +95,5 @@ index 8ccc7c5..4669dee 100644
if ( tabComplete.getCursor().startsWith( "/" ) ) if ( tabComplete.getCursor().startsWith( "/" ) )
-- --
2.7.4 (Apple Git-66) 2.10.0

6
BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 7a19a478b89b6df8cc345ea44cfc75d119a67565 Mon Sep 17 00:00:00 2001 From ede5d2561eadd6f28fe3ee76dc2700992a8db477 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.
@ -123,10 +123,10 @@ index bdcbdb7..d14d893 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 4669dee..417b2f7 100644 index 654be21..618e76e 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
@@ -211,6 +211,6 @@ public class UpstreamBridge extends PacketHandler @@ -213,6 +213,6 @@ public class UpstreamBridge extends PacketHandler
@Override @Override
public String toString() public String toString()
{ {

10
BungeeCord-Patches/0028-Validate-that-chat-messages-are-non-blank.patch
View File

@ -1,4 +1,4 @@
From 6160bd409a7759a460bddb26dae0dfc36a0680a4 Mon Sep 17 00:00:00 2001 From 68af736ef6664d9e53c126cc7e43fbc6ec60afa7 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
@ -34,7 +34,7 @@ index 0000000..d294dda
+} +}
\ No newline at end of file \ No newline at end of file
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 417b2f7..3c3fd98 100644 index 618e76e..9e753d5 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 @@
@ -45,10 +45,10 @@ index 417b2f7..3c3fd98 100644
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.md_5.bungee.BungeeCord; import net.md_5.bungee.BungeeCord;
@@ -112,6 +113,7 @@ public class UpstreamBridge extends PacketHandler @@ -114,6 +115,7 @@ public class UpstreamBridge extends PacketHandler
public void handle(Chat chat) throws Exception
{ {
Preconditions.checkArgument( chat.getMessage().length() <= 100, "Chat message too long" ); // Mojang limit, check on updates 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(!StringUtil.isBlank(chat.getMessage()), "Chat message is empty"); + Preconditions.checkArgument(!StringUtil.isBlank(chat.getMessage()), "Chat message is empty");
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() ); ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );