Merge upstream

Waterfall

@@ -1 +1 @@
-Subproject commit 99bc9a7029b34532e438eb168e7888edf33f78c8
+Subproject commit ed37fdbc41df8d3db52324eb4c460b00e7296909

Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch

@@ -1,4 +1,4 @@
-From dbea7cd7b61c3c116421321b572ae402618fd288 Mon Sep 17 00:00:00 2001
+From 70af67347ba7a8df0bc93392d40f663a2ea4810f 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 f036efcd..c93c313a 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 1b486867..83b7d8ba 100644
+index 90e7d4f1..bea13ea8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -182,7 +182,7 @@ public class BungeeCord extends ProxyServer
@@ -78,7 +78,7 @@ index 1b486867..83b7d8ba 100644
  
          try
          {
-@@ -495,7 +495,7 @@ public class BungeeCord extends ProxyServer
+@@ -493,7 +493,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getName()
      {

Waterfall-Proxy-Patches/0003-Fixup-ProtocolConstants.patch

@@ -1,4 +1,4 @@
-From 97f3d1f3a718027385ab50bc0a5e6ad9d46ff02f Mon Sep 17 00:00:00 2001
+From 5adbaea1b5db0b403749e7f4c9a5c0ebe7c2df67 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 09:07:51 -0500
 Subject: [PATCH] Fixup ProtocolConstants

Waterfall-Proxy-Patches/0003-Metrics.patch

@@ -1,22 +0,0 @@
-From 3597a1aa6a5228dbe8ce426e082c87b43214d79b Mon Sep 17 00:00:00 2001
-From: Techcable <Techcable@techcable.net>
-Date: Mon, 6 Jun 2016 13:49:46 -0600
-Subject: [PATCH] Metrics
-
-
-diff --git a/proxy/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/net/md_5/bungee/Metrics.java
-index e482e98..86d7a5a 100644
---- a/proxy/src/main/java/net/md_5/bungee/Metrics.java
-+++ b/proxy/src/main/java/net/md_5/bungee/Metrics.java
-@@ -72,7 +72,7 @@ public class Metrics extends TimerTask
-         }
- 
-         // Create the url
--        URL url = new URL( BASE_URL + String.format( REPORT_URL, encode( "Waterfall" ) ) );
-+        URL url = new URL( BASE_URL + String.format( REPORT_URL, encode( "Travertine" ) ) );
- 
-         // Connect to the website
-         URLConnection connection;
--- 
-2.7.4 (Apple Git-66)
-

Waterfall-Proxy-Patches/0004-1.7.x-Protocol-Patch.patch

@@ -1,4 +1,4 @@
-From bfaa55806c50a048ebaa502c2d2be6502a302871 Mon Sep 17 00:00:00 2001
+From 5a1d579596bf1069486adbb40cff383104f85583 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 10:31:04 -0500
 Subject: [PATCH] 1.7.x Protocol Patch
@@ -689,7 +689,7 @@ index 9983ef2e..ae5dad52 100644
      public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
      {
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
-index 04644236..029618cf 100644
+index 0e06b49d..ac7451dc 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
 @@ -3,8 +3,8 @@ package net.md_5.bungee.protocol.packet;
@@ -996,7 +996,7 @@ index 8be62c7b..180f5146 100644
      public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
      {
 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 83b7d8ba..57afcbbe 100644
+index bea13ea8..22622c56 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -163,6 +163,14 @@ public class BungeeCord extends ProxyServer
@@ -1210,7 +1210,7 @@ index ef12a019..4a1c3638 100644
          {
              this.compressionThreshold = compressionThreshold;
 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 287a42bd..7eb40136 100644
+index 76dc13aa..242efd91 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 @@ -144,7 +144,7 @@ public class DownstreamBridge extends PacketHandler
@@ -1354,7 +1354,7 @@ index 76f496ce..eab2523d 100644
          channel.close();
      }
 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 719ad409..a5c798f4 100644
+index 7129f5e7..6440db3a 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
 @@ -79,7 +79,12 @@ public class UpstreamBridge extends PacketHandler
@@ -1372,7 +1372,7 @@ index 719ad409..a5c798f4 100644
              con.getServer().disconnect( "Quitting" );
          }
 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 bad9773b..45716724 100644
+index 4df06119..b1d2714c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 @@ -29,6 +29,10 @@ public abstract class EntityMap