Updated Upstream (BungeeCord)

Also, pulled in papers upstreamCommit script to provide more consistency and information
across the project

BungeeCord Changes:
6d6fbb5e Fix two minor formatting issues
0d6f3ee3 Make 1.13 command injection normal functionality
This commit is contained in:
Shane Freeder 2019-02-20 18:51:36 +00:00
parent 09ef1a5613
commit 0874931518
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
7 changed files with 50 additions and 22 deletions

@ -1 +1 @@
Subproject commit 28c82238d0ef880b4ba79bd1516eb652bf2513c5 Subproject commit 6d6fbb5efa06259166cc2e6f56e6320bf0d6316d

View File

@ -1,4 +1,4 @@
From ef5769511bea1499c03d9fac88efc172e18852c8 Mon Sep 17 00:00:00 2001 From 795dcb51d78f36d9beedc797720c9cf556231ddd 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
@ -10,7 +10,7 @@ Kicks players on failure to move.
Original Issue: https://github.com/WaterfallMC/Waterfall-Old/issues/17 Original Issue: https://github.com/WaterfallMC/Waterfall-Old/issues/17
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 62c4bc74..7b82ced7 100644 index 886f3b4c..7c915e88 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -11,12 +11,15 @@ import java.util.UUID; @@ -11,12 +11,15 @@ import java.util.UUID;
@ -29,7 +29,7 @@ index 62c4bc74..7b82ced7 100644
import net.md_5.bungee.util.CaseInsensitiveMap; import net.md_5.bungee.util.CaseInsensitiveMap;
import net.md_5.bungee.util.CaseInsensitiveSet; import net.md_5.bungee.util.CaseInsensitiveSet;
@@ -111,18 +114,31 @@ public abstract class Configuration implements ProxyConfig @@ -105,18 +108,31 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers ); servers = new CaseInsensitiveMap<>( newServers );
} else } else
{ {

View File

@ -1,4 +1,4 @@
From c6632e1a71fdcd40b8707e2477111f61df3093f6 Mon Sep 17 00:00:00 2001 From d1f6fc4f1cc1bc41e9e321fbc3c3ab7a6807a1c7 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
@ -37,10 +37,10 @@ index ea44573d..5b32effe 100644
{ {
packet.read( in, prot.getDirection(), protocolVersion ); packet.read( in, prot.getDirection(), protocolVersion );
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 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 6e2abdc5..1161dc5d 100644 index e6c3729c..af6a6d40 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -411,14 +411,23 @@ public enum Protocol @@ -408,14 +408,23 @@ public enum Protocol
return protocol; return protocol;
} }
@ -105,7 +105,7 @@ index c2cb40b9..6843fd8b 100644
@Getter @Getter
@NonNull @NonNull
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
index af4da071..7c19c6fb 100644 index 1ecee69e..994670cd 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -273,6 +273,12 @@ public abstract class EntityMap @@ -273,6 +273,12 @@ public abstract class EntityMap

View File

@ -1,4 +1,4 @@
From ea1d42deba74d83ef894f4accf66b8ffb61fcb32 Mon Sep 17 00:00:00 2001 From 409714e4e17b097a97540fae759b0d955cb35f5a 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,10 +73,10 @@ index f7bace0e..e7869cfb 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 bfbc8b18..f52c1312 100644 index 18636ca6..f258ddeb 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
@@ -602,6 +602,6 @@ public class DownstreamBridge extends PacketHandler @@ -599,6 +599,6 @@ public class DownstreamBridge extends PacketHandler
@Override @Override
public String toString() public String toString()
{ {
@ -118,7 +118,7 @@ index 13215254..4e1a4413 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 54ccaa49..4bb61f63 100644 index de916f6e..bdaee47e 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
@@ -267,6 +267,6 @@ public class UpstreamBridge extends PacketHandler @@ -267,6 +267,6 @@ public class UpstreamBridge extends PacketHandler

View File

@ -1,4 +1,4 @@
From db2774fb8d885c9f51273bf27ed55a369fe4c394 Mon Sep 17 00:00:00 2001 From c8593999b470857ca5d9f5bd6515eae071558aa0 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.
@ -181,7 +181,7 @@ index 7c437c75..ef6d2028 100644
@Override @Override
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 7b82ced7..7d54e41a 100644 index 7c915e88..92093602 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
@ -208,15 +208,15 @@ index 7b82ced7..7d54e41a 100644
/** /**
* Set of all servers. * Set of all servers.
*/ */
@@ -66,6 +69,7 @@ public abstract class Configuration implements ProxyConfig @@ -65,6 +68,7 @@ public abstract class Configuration implements ProxyConfig
private boolean preventProxyConnections;
private boolean forgeSupport; private boolean forgeSupport;
private boolean injectCommands;
+ @Synchronized("serversLock") // Waterfall + @Synchronized("serversLock") // Waterfall
public void load() public void load()
{ {
ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter(); ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter();
@@ -114,7 +118,7 @@ public abstract class Configuration implements ProxyConfig @@ -108,7 +112,7 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers ); servers = new CaseInsensitiveMap<>( newServers );
} else } else
{ {
@ -225,7 +225,7 @@ index 7b82ced7..7d54e41a 100644
this.servers = new CaseInsensitiveMap<>(newServers); this.servers = new CaseInsensitiveMap<>(newServers);
for ( ServerInfo oldServer : oldServers.values() ) for ( ServerInfo oldServer : oldServers.values() )
@@ -172,4 +176,71 @@ public abstract class Configuration implements ProxyConfig @@ -166,4 +170,71 @@ public abstract class Configuration implements ProxyConfig
{ {
return favicon; return favicon;
} }

View File

@ -1,11 +1,11 @@
From 0e00fe3d861d036364105256e5cba4dcbde97371 Mon Sep 17 00:00:00 2001 From aee90e210ae6132b9276f7e6a0f7dfa7c6b47f56 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk> From: Jamie Mansfield <dev@jamierocks.uk>
Date: Mon, 28 May 2018 21:43:55 +0100 Date: Mon, 28 May 2018 21:43:55 +0100
Subject: [PATCH] Forge is a first class citizen Subject: [PATCH] Forge is a first class citizen
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 bda6525c..a518fe45 100644 index c407cc97..4ff03488 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
@@ -275,8 +275,6 @@ public class BungeeCord extends ProxyServer @@ -275,8 +275,6 @@ public class BungeeCord extends ProxyServer
@ -18,7 +18,7 @@ index bda6525c..a518fe45 100644
isRunning = true; isRunning = true;
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 7d54e41a..2a3a47af 100644 index 92093602..0482d74a 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -66,7 +66,7 @@ public abstract class Configuration implements ProxyConfig @@ -66,7 +66,7 @@ public abstract class Configuration implements ProxyConfig
@ -27,9 +27,9 @@ index 7d54e41a..2a3a47af 100644
private boolean preventProxyConnections; private boolean preventProxyConnections;
- private boolean forgeSupport; - private boolean forgeSupport;
+ private boolean forgeSupport = true; // Waterfall: default to enabled + private boolean forgeSupport = true; // Waterfall: default to enabled
private boolean injectCommands;
@Synchronized("serversLock") // Waterfall @Synchronized("serversLock") // Waterfall
public void load()
-- --
2.20.1 2.20.1

28
scripts/upstreamCommit.sh Executable file
View File

@ -0,0 +1,28 @@
#!/usr/bin/env bash
(
set -e
PS1="$"
function changelog() {
base=$(git ls-tree HEAD $1 | cut -d' ' -f3 | cut -f1)
cd $1 && git log --oneline ${base}...HEAD
}
bungee=$(changelog BungeeCord)
updated=""
logsuffix=""
if [ ! -z "$bungee" ]; then
logsuffix="$logsuffix\n\nBungeeCord Changes:\n$bungee"
if [ -z "$updated" ]; then updated="BungeeCord"; else updated="$updated/BungeeCord"; fi
fi
disclaimer="Upstream has released updates that appears to apply and compile correctly.\nThis update has not been tested by PaperMC and as with ANY update, please do your own testing"
if [ ! -z "$1" ]; then
disclaimer="$@"
fi
log="${UP_LOG_PREFIX}Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
echo -e "$log" | git commit -F -
) || exit 1