From a536194466356d12253cb080443ecc71c4374319 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 19 Nov 2017 08:47:57 +0000
Subject: [PATCH] Merge upstream

---
 Waterfall                                            |  2 +-
 ...ame-references-from-Waterfall-to-Travertine.patch | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Waterfall b/Waterfall
index 71b7665..42bc9c3 160000
--- a/Waterfall
+++ b/Waterfall
@@ -1 +1 @@
-Subproject commit 71b76653f2617646ef76779833c1bf0dc5de8942
+Subproject commit 42bc9c39a9cfdd338a0b55703b24d8bcad46cb28
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 7cc04b3..c056edb 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 365bf135380ccbfd7f26755a5d8bb2349998c58e Mon Sep 17 00:00:00 2001
+From 892b6ffc6d9a997d12484b07ab0d924ce5af4f6b Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 6 Jun 2016 13:47:46 -0600
 Subject: [PATCH] Rename references from Waterfall to Travertine
@@ -66,7 +66,7 @@ index c3cb5aaa..750217b1 100644
  
          // Waterfall start - Use TerminalConsoleAppender
 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 da2904b0..c849b848 100644
+index 0cba0076..f9fddf07 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -179,7 +179,7 @@ public class BungeeCord extends ProxyServer
@@ -78,7 +78,7 @@ index da2904b0..c849b848 100644
  
          try
          {
-@@ -486,7 +486,7 @@ public class BungeeCord extends ProxyServer
+@@ -479,7 +479,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getName()
      {
@@ -100,10 +100,10 @@ index b26035cf..4e2c6129 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
-index 4a492414..55267f40 100644
+index f5c028dd..c50a05f7 100644
 --- a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
 +++ b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
-@@ -22,7 +22,7 @@ public class CommandReload extends Command
+@@ -23,7 +23,7 @@ public class CommandReload extends Command
          BungeeCord.getInstance().startListeners();
          BungeeCord.getInstance().getPluginManager().callEvent( new ProxyReloadEvent( sender ) );
  
@@ -127,5 +127,5 @@ index 1019c307..ff2c0725 100644
              InetSocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.14.2
+2.15.0