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

Update BungeeCord

Browse Source
This commit is contained in:
Shane Freeder 2019-02-03 18:06:37 +00:00
parent 7dd259045b
commit 09ef1a5613
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 0dd538f9ff77c20da72c4530b3d21633799bc3a5 Subproject commit 28c82238d0ef880b4ba79bd1516eb652bf2513c5

6
BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch
View File

@ -1,4 +1,4 @@
From a3d08e67c922ca102c733d7f6f26530d9b2dbb03 Mon Sep 17 00:00:00 2001 From 1c177ba6eb08c7c8d1a3f8c8bff33344fd70a008 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:28:45 -0700 Date: Thu, 19 May 2016 11:28:45 -0700
Subject: [PATCH] Rename references from BungeeCord to Waterfall Subject: [PATCH] Rename references from BungeeCord to Waterfall
@ -18,7 +18,7 @@ index f1ccd4f6..d703d6d2 100644
} }
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 20e14557..7fe5bbea 100644 index 6599e38e..8d931b1d 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
@@ -181,7 +181,7 @@ public class BungeeCord extends ProxyServer @@ -181,7 +181,7 @@ public class BungeeCord extends ProxyServer
@ -30,7 +30,7 @@ index 20e14557..7fe5bbea 100644
System.setSecurityManager( new BungeeSecurityManager() ); System.setSecurityManager( new BungeeSecurityManager() );
@@ -486,7 +486,7 @@ public class BungeeCord extends ProxyServer @@ -492,7 +492,7 @@ public class BungeeCord extends ProxyServer
@Override @Override
public String getName() public String getName()
{ {

8
BungeeCord-Patches/0005-Disable-Metrics.patch
View File

@ -1,4 +1,4 @@
From 4aabe9a68bec1377ce1f669eb45d9496ff52b46a Mon Sep 17 00:00:00 2001 From d82607666d67970313984865327a2f4542d8ea09 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk> From: Jamie Mansfield <dev@jamierocks.uk>
Date: Thu, 19 May 2016 10:55:20 -0700 Date: Thu, 19 May 2016 10:55:20 -0700
Subject: [PATCH] Disable Metrics Subject: [PATCH] Disable Metrics
@ -6,7 +6,7 @@ Subject: [PATCH] Disable Metrics
MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;) MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;)
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 a8bb4fd0..bfb83c21 100644 index 44a77ff3..f38445d6 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
@@ -121,7 +121,7 @@ public class BungeeCord extends ProxyServer @@ -121,7 +121,7 @@ public class BungeeCord extends ProxyServer
@ -27,7 +27,7 @@ index a8bb4fd0..bfb83c21 100644
} }
public void startListeners() public void startListeners()
@@ -423,7 +423,7 @@ public class BungeeCord extends ProxyServer @@ -429,7 +429,7 @@ public class BungeeCord extends ProxyServer
reconnectHandler.close(); reconnectHandler.close();
} }
saveThread.cancel(); saveThread.cancel();
@ -172,5 +172,5 @@ index a7ce8d82..00000000
- } - }
-} -}
-- --
2.19.1 2.20.1

6
BungeeCord-Patches/0016-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From 5e44afa155b708568fbd414bd5d7f930626b2bb3 Mon Sep 17 00:00:00 2001 From f0d0879bb02cdef1fc1cf2c25d82085848903d90 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700 Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations Subject: [PATCH] Micro-optimizations
@ -8,10 +8,10 @@ Subject: [PATCH] Micro-optimizations
- Don't create a data input stream for every plugin message we get from servers - Don't create a data input stream for every plugin message we get from servers
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 d9f49e34..eb369ebb 100644 index 5d98c781..be32db49 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
@@ -515,7 +515,9 @@ public class BungeeCord extends ProxyServer @@ -521,7 +521,9 @@ public class BungeeCord extends ProxyServer
String translation = "<translation '" + name + "' missing>"; String translation = "<translation '" + name + "' missing>";
try try
{ {

10
BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch
View File

@ -1,4 +1,4 @@
From 646fe1ca409a835cd6880bfe4909c49c7a5a0036 Mon Sep 17 00:00:00 2001 From 6213ee559f57aa142489b6f071e612fb199b4244 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com> From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700 Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group. Subject: [PATCH] Use a worker and a boss event loop group.
@ -8,7 +8,7 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
This is proper practice for netty. This is proper practice for netty.
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 eb369ebb..d8ea68ea 100644 index be32db49..7c437c75 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
@@ -116,7 +116,7 @@ public class BungeeCord extends ProxyServer @@ -116,7 +116,7 @@ public class BungeeCord extends ProxyServer
@ -30,7 +30,7 @@ index eb369ebb..d8ea68ea 100644
File moduleDirectory = new File( "modules" ); File moduleDirectory = new File( "modules" );
moduleManager.load( this, moduleDirectory ); moduleManager.load( this, moduleDirectory );
@@ -327,7 +328,7 @@ public class BungeeCord extends ProxyServer @@ -333,7 +334,7 @@ public class BungeeCord extends ProxyServer
.option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere! .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
.childAttr( PipelineUtils.LISTENER, info ) .childAttr( PipelineUtils.LISTENER, info )
.childHandler( PipelineUtils.SERVER_CHILD ) .childHandler( PipelineUtils.SERVER_CHILD )
@ -39,7 +39,7 @@ index eb369ebb..d8ea68ea 100644
.localAddress( info.getHost() ) .localAddress( info.getHost() )
.bind().addListener( listener ); .bind().addListener( listener );
@@ -348,7 +349,7 @@ public class BungeeCord extends ProxyServer @@ -354,7 +355,7 @@ public class BungeeCord extends ProxyServer
} }
} }
}; };
@ -48,7 +48,7 @@ index eb369ebb..d8ea68ea 100644
} }
} }
} }
@@ -443,12 +444,14 @@ public class BungeeCord extends ProxyServer @@ -449,12 +450,14 @@ public class BungeeCord extends ProxyServer
} }
getLogger().info( "Closing IO threads" ); getLogger().info( "Closing IO threads" );

6
BungeeCord-Patches/0026-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From 31493ce2966e381dd290cf0a99eb1219fe91da76 Mon Sep 17 00:00:00 2001 From db2774fb8d885c9f51273bf27ed55a369fe4c394 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.
@ -157,10 +157,10 @@ index ebf9a12d..489b0018 100644
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT ); private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
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 d8ea68ea..9f1e5a0a 100644 index 7c437c75..ef6d2028 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
@@ -591,10 +591,18 @@ public class BungeeCord extends ProxyServer @@ -597,10 +597,18 @@ public class BungeeCord extends ProxyServer
return config.getServers(); return config.getServers();
} }

8
BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch
View File

@ -1,4 +1,4 @@
From 5ed880564fe4c92ae4d90fa41ae1bc3a5c18285e Mon Sep 17 00:00:00 2001 From b8ab554d593ed32ef31e012bf2e1a435c38f305f 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 13:56:57 -0500 Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response Subject: [PATCH] Configurable server version in ping response
@ -68,10 +68,10 @@ index a5db82b8..e55c28d8 100644
public int getTabThrottle() { public int getTabThrottle() {
return tabThrottle; return tabThrottle;
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 9dee3bff..5f34eb4e 100644 index ef6d2028..00f8a19c 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
@@ -645,7 +645,7 @@ public class BungeeCord extends ProxyServer @@ -651,7 +651,7 @@ public class BungeeCord extends ProxyServer
@Override @Override
public String getGameVersion() public String getGameVersion()
{ {
@ -81,5 +81,5 @@ index 9dee3bff..5f34eb4e 100644
@Override @Override
-- --
2.19.1 2.20.1