From d6532d31f7a360581ba3fd9f29c4bfa5633be795 Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Mon, 22 Aug 2016 22:31:34 +0100 Subject: [PATCH] Update upstream Hopefully this has worked. I did it rather quickly during the break of American Dad and on mobile data. This is also my first commit from this Ubuntu installation :D --- BungeeCord | 2 +- ...basic-support-for-configurable-tab-complete-thro.patch | 8 ++++---- .../0023-Optional-server-list-ping-logging.patch | 8 ++++---- ...re-incoming-chat-messages-before-connecting-to-t.patch | 8 ++++---- .../0031-Validate-that-chat-messages-are-non-blank.patch | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/BungeeCord b/BungeeCord index 504d3c0..6563a92 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 504d3c0529e2014d5a1c469206db3bfd440829a7 +Subproject commit 6563a9241bce93ca99be5eded5f6904c3ba872a6 diff --git a/BungeeCord-Patches/0021-Add-basic-support-for-configurable-tab-complete-thro.patch b/BungeeCord-Patches/0021-Add-basic-support-for-configurable-tab-complete-thro.patch index 184d624..6055ae3 100644 --- a/BungeeCord-Patches/0021-Add-basic-support-for-configurable-tab-complete-thro.patch +++ b/BungeeCord-Patches/0021-Add-basic-support-for-configurable-tab-complete-thro.patch @@ -1,4 +1,4 @@ -From 06e1050016ad3e3e245387ca9e766ee358c367d5 Mon Sep 17 00:00:00 2001 +From fc32e223b6d2932832929906d795490987e6318f Mon Sep 17 00:00:00 2001 From: Johannes Donath Date: Sat, 4 Jul 2015 06:31:33 +0200 Subject: [PATCH] Add basic support for configurable tab-complete throttling @@ -64,7 +64,7 @@ index 1fa3ecd..23a5c94 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 -index 0e5699c..9f409fb 100644 +index 7e1917f..11c6267 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 @@ -31,6 +31,8 @@ public class UpstreamBridge extends PacketHandler @@ -76,7 +76,7 @@ index 0e5699c..9f409fb 100644 public UpstreamBridge(ProxyServer bungee, UserConnection con) { this.bungee = bungee; -@@ -124,6 +126,16 @@ public class UpstreamBridge extends PacketHandler +@@ -127,6 +129,16 @@ public class UpstreamBridge extends PacketHandler @Override public void handle(TabCompleteRequest tabComplete) throws Exception { @@ -94,5 +94,5 @@ index 0e5699c..9f409fb 100644 if ( tabComplete.getCursor().startsWith( "/" ) ) -- -2.9.0 +2.7.4 diff --git a/BungeeCord-Patches/0023-Optional-server-list-ping-logging.patch b/BungeeCord-Patches/0023-Optional-server-list-ping-logging.patch index fb13cd9..55cc5c5 100644 --- a/BungeeCord-Patches/0023-Optional-server-list-ping-logging.patch +++ b/BungeeCord-Patches/0023-Optional-server-list-ping-logging.patch @@ -1,4 +1,4 @@ -From b551cbf97c648845654e922bcf2444c9981acccd Mon Sep 17 00:00:00 2001 +From 56a64fd4435ed27505c72ef90cb96e83373e4774 Mon Sep 17 00:00:00 2001 From: Janmm14 Date: Sat, 12 Dec 2015 23:43:30 +0100 Subject: [PATCH] Optional server list ping logging. @@ -122,10 +122,10 @@ index 3fe1d23..501d5ba 100644 @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 -index 7b9678e..35e231d 100644 +index 11c6267..0db7d17 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 -@@ -209,6 +209,6 @@ public class UpstreamBridge extends PacketHandler +@@ -212,6 +212,6 @@ public class UpstreamBridge extends PacketHandler @Override public String toString() { @@ -134,5 +134,5 @@ index 7b9678e..35e231d 100644 } } -- -2.8.2 +2.7.4 diff --git a/BungeeCord-Patches/0026-Ignore-incoming-chat-messages-before-connecting-to-t.patch b/BungeeCord-Patches/0026-Ignore-incoming-chat-messages-before-connecting-to-t.patch index 6780eb0..054f8d7 100644 --- a/BungeeCord-Patches/0026-Ignore-incoming-chat-messages-before-connecting-to-t.patch +++ b/BungeeCord-Patches/0026-Ignore-incoming-chat-messages-before-connecting-to-t.patch @@ -1,4 +1,4 @@ -From 28bb996613c88b85be396317f1e63bac648a8100 Mon Sep 17 00:00:00 2001 +From 2b89dd0f47d01460bcc216f19be3b696c8d2de14 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Tue, 23 Jun 2015 21:56:13 +0200 Subject: [PATCH] Ignore incoming chat messages before connecting to the @@ -7,7 +7,7 @@ Subject: [PATCH] Ignore incoming chat messages before connecting to the Merges SpigotMC/BungeeCord#1515 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 25e3e07..dfc14c5 100644 +index 0db7d17..11be7e9 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 @@ -2,6 +2,7 @@ package net.md_5.bungee.connection; @@ -18,7 +18,7 @@ index 25e3e07..dfc14c5 100644 import net.md_5.bungee.UserConnection; import net.md_5.bungee.Util; import net.md_5.bungee.api.ProxyServer; -@@ -111,13 +112,21 @@ public class UpstreamBridge extends PacketHandler +@@ -114,13 +115,21 @@ public class UpstreamBridge extends PacketHandler { Preconditions.checkArgument( chat.getMessage().length() <= 100, "Chat message too long" ); // Mojang limit, check on updates @@ -43,5 +43,5 @@ index 25e3e07..dfc14c5 100644 } throw CancelSendSignal.INSTANCE; -- -2.9.0 +2.7.4 diff --git a/BungeeCord-Patches/0031-Validate-that-chat-messages-are-non-blank.patch b/BungeeCord-Patches/0031-Validate-that-chat-messages-are-non-blank.patch index bc6457c..2e5f118 100644 --- a/BungeeCord-Patches/0031-Validate-that-chat-messages-are-non-blank.patch +++ b/BungeeCord-Patches/0031-Validate-that-chat-messages-are-non-blank.patch @@ -1,4 +1,4 @@ -From f6eef2be4eae70e6c494e96e8b4bdac1e708408d Mon Sep 17 00:00:00 2001 +From bad5f8b33244ab4ed5323ab193fed5ac3faa278b Mon Sep 17 00:00:00 2001 From: Tux Date: Wed, 13 Apr 2016 14:00:40 -0400 Subject: [PATCH] Validate that chat messages are non-blank @@ -33,7 +33,7 @@ index 0000000..940ad80 + } +} 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 10b828b..4711fe0 100644 +index 80b9098..e4330d6 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 @@ @@ -44,7 +44,7 @@ index 10b828b..4711fe0 100644 import net.md_5.bungee.BungeeCord; import net.md_5.bungee.ServerConnection; import net.md_5.bungee.UserConnection; -@@ -112,6 +113,7 @@ public class UpstreamBridge extends PacketHandler +@@ -115,6 +116,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 @@ -53,5 +53,5 @@ index 10b828b..4711fe0 100644 ServerConnection server = con.getServer(); -- -2.9.0 +2.7.4