From 02c7c496b2cce9bf308ae69a1dfe551d5850abb9 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 20 Mar 2019 03:58:21 +0000 Subject: [PATCH] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: 8f8bdf5 Updated Upstream (BungeeCord) c803d54 Manually specify deploy plugin version 897f9d6 Aggregate API and Chat Javadocs 6a98009 Apply delombok to sources, generate javadocs from delombok sources aec375c fix critical formatting error --- Waterfall | 2 +- ...ename-references-from-Waterfall-to-Travertine.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Waterfall b/Waterfall index 03ebf04..8f8bdf5 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 03ebf04b65ff8ea99363c6bc5fa3bd0030143111 +Subproject commit 8f8bdf58a9869bbddde471c68f512e5decfb73f6 diff --git a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch index b78cbee..baad8d5 100644 --- a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch +++ b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch @@ -1,4 +1,4 @@ -From a61eb5686a6877101ef42987f90a559d43daa91c Mon Sep 17 00:00:00 2001 +From 6dbb0986bc03acc3b25aea3ebbe97a7bf84b9b8b Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 6 Jun 2016 13:47:46 -0600 Subject: [PATCH] Rename references from Waterfall to Travertine @@ -53,10 +53,10 @@ index 4ff03488..79a3a145 100644 @Override diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java -index 3f52dad9..c9093462 100644 +index 624eb5f0..bc3d875e 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java -@@ -43,7 +43,7 @@ public class BungeeCordLauncher +@@ -49,7 +49,7 @@ public class BungeeCordLauncher if ( buildDate.before( deadline.getTime() ) ) { System.err.println( "*** Hey! This build is potentially outdated :( ***" ); @@ -65,7 +65,7 @@ index 3f52dad9..c9093462 100644 System.err.println( "*** Should this build be outdated, you will get NO support for it. ***" ); System.err.println( "*** Server will start in 10 seconds ***" ); Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) ); -@@ -52,7 +52,7 @@ public class BungeeCordLauncher +@@ -58,7 +58,7 @@ public class BungeeCordLauncher BungeeCord bungee = new BungeeCord(); ProxyServer.setInstance( bungee ); @@ -114,5 +114,5 @@ index 44011a96..8cceac2d 100644 InetSocketAddress address = Util.getAddr( addr ); ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted ); -- -2.20.1 +2.21.0