diff --git a/Waterfall b/Waterfall index d598d51..56fd936 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit d598d51135e6740e74a35637cf5eb1336327f25f +Subproject commit 56fd9366641862ab769fe52ceb445f49a344c208 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 fe26131..f66a53b 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 c284c69375c4e5c26cdcd700ce0a8b322a1492fb Mon Sep 17 00:00:00 2001 +From a8c3e7fd1e63d91bd3fa42856f1fe528853aa7ac 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 @@ -31,10 +31,10 @@ index d703d6d2..d8dcdc1e 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 -index 8acdc22d..58b0983c 100644 +index c7ac1735..e23e52f5 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -180,7 +180,7 @@ public class BungeeCord extends ProxyServer +@@ -181,7 +181,7 @@ public class BungeeCord extends ProxyServer public BungeeCord() throws IOException { // Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up. @@ -43,7 +43,7 @@ index 8acdc22d..58b0983c 100644 try { -@@ -495,7 +495,7 @@ public class BungeeCord extends ProxyServer +@@ -498,7 +498,7 @@ public class BungeeCord extends ProxyServer @Override public String getName() { @@ -53,7 +53,7 @@ index 8acdc22d..58b0983c 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 624eb5f0..bc3d875e 100644 +index dc2c584d..ad9a6d0c 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java @@ -49,7 +49,7 @@ public class BungeeCordLauncher @@ -101,7 +101,7 @@ index 720d0c3b..dca7601b 100644 } } diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java -index 44011a96..8cceac2d 100644 +index 85c2a0b5..86a247be 100644 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java @@ -224,7 +224,7 @@ public class YamlConfig implements ConfigurationAdapter @@ -111,8 +111,8 @@ index 44011a96..8cceac2d 100644 - String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another Waterfall - Forced Host", val ) ); + String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another Travertine - Forced Host", val ) ); boolean restricted = get( "restricted", false, val ); - InetSocketAddress address = Util.getAddr( addr ); + SocketAddress address = Util.getAddr( addr ); ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted ); -- -2.21.0 +2.25.0 diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch index 43edc93..b469e67 100644 --- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch +++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch @@ -1,4 +1,4 @@ -From 52c98d078eacd8e3ccc89b826cff2493027613bb Mon Sep 17 00:00:00 2001 +From 33d7a13fa1c070cf229f07df6fca7bfe92623687 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 10:31:04 -0500 Subject: [PATCH] 1.7.x Protocol Patch @@ -1259,10 +1259,10 @@ index a5555f6a..415a4bcd 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 122befe6..26719300 100644 +index e23e52f5..6f929030 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -162,6 +162,14 @@ public class BungeeCord extends ProxyServer +@@ -163,6 +163,14 @@ public class BungeeCord extends ProxyServer .registerTypeAdapter( SelectorComponent.class, new SelectorComponentSerializer() ) .registerTypeAdapter( ServerPing.PlayerInfo.class, new PlayerInfoSerializer() ) .registerTypeAdapter( Favicon.class, Favicon.getFaviconTypeAdapter() ).create(); @@ -1353,18 +1353,18 @@ index 491cf1a1..299a216c 100644 } } diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index 00cd477f..ed53591c 100644 +index 139c4f09..6a089d8d 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; - import io.netty.buffer.ByteBufAllocator; +@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufAllocator; + import java.net.InetSocketAddress; import java.util.Locale; import java.util.Arrays; // Waterfall +import java.nio.charset.StandardCharsets; // Travertine import java.util.Queue; import java.util.Set; import java.util.UUID; -@@ -248,10 +249,20 @@ public class ServerConnector extends PacketHandler +@@ -249,10 +250,20 @@ public class ServerConnector extends PacketHandler user.unsafe().sendPacket( modLogin ); @@ -1389,7 +1389,7 @@ index 00cd477f..ed53591c 100644 user.setDimension( login.getDimension() ); } else -@@ -263,7 +274,7 @@ public class ServerConnector extends PacketHandler +@@ -264,7 +275,7 @@ public class ServerConnector extends PacketHandler if ( !user.isDisableEntityMetadataRewrite() ) { // Waterfall for ( Objective objective : serverScoreboard.getObjectives() ) { @@ -1398,7 +1398,7 @@ index 00cd477f..ed53591c 100644 } for ( Score score : serverScoreboard.getScores() ) { -@@ -425,6 +436,14 @@ public class ServerConnector extends PacketHandler +@@ -426,6 +437,14 @@ public class ServerConnector extends PacketHandler { this.handshakeHandler.handle( pluginMessage ); @@ -1414,10 +1414,10 @@ index 00cd477f..ed53591c 100644 throw CancelSendSignal.INSTANCE; } diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -index b4cbc3f3..6bfa4cb7 100644 +index e9284882..2c4d057f 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -195,6 +195,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -196,6 +196,7 @@ public final class UserConnection implements ProxiedPlayer public void setDisplayName(String name) { Preconditions.checkNotNull( name, "displayName" ); @@ -1425,7 +1425,7 @@ index b4cbc3f3..6bfa4cb7 100644 displayName = name; } -@@ -476,7 +477,8 @@ public final class UserConnection implements ProxiedPlayer +@@ -477,7 +478,8 @@ public final class UserConnection implements ProxiedPlayer // transform score components message = ChatComponentTransformer.getInstance().transform( this, message ); @@ -1435,7 +1435,7 @@ index b4cbc3f3..6bfa4cb7 100644 { // Versions older than 1.11 cannot send the Action bar with the new JSON formattings // Fix by converting to a legacy message, see https://bugs.mojang.com/browse/MC-119145 -@@ -502,7 +504,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -503,7 +505,7 @@ public final class UserConnection implements ProxiedPlayer message = ChatComponentTransformer.getInstance().transform( this, message )[0]; // Action bar doesn't display the new JSON formattings, legacy works - send it using this for now @@ -1444,7 +1444,7 @@ index b4cbc3f3..6bfa4cb7 100644 { sendMessage( position, ComponentSerializer.toString( new TextComponent( BaseComponent.toLegacyText( message ) ) ) ); } else -@@ -681,6 +683,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -688,6 +690,7 @@ public final class UserConnection implements ProxiedPlayer @Override public void setTabHeader(BaseComponent header, BaseComponent footer) { @@ -1452,7 +1452,7 @@ index b4cbc3f3..6bfa4cb7 100644 header = ChatComponentTransformer.getInstance().transform( this, header )[0]; footer = ChatComponentTransformer.getInstance().transform( this, footer )[0]; -@@ -693,6 +696,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -700,6 +703,7 @@ public final class UserConnection implements ProxiedPlayer @Override public void setTabHeader(BaseComponent[] header, BaseComponent[] footer) { @@ -1460,7 +1460,7 @@ index b4cbc3f3..6bfa4cb7 100644 header = ChatComponentTransformer.getInstance().transform( this, header ); footer = ChatComponentTransformer.getInstance().transform( this, footer ); -@@ -722,6 +726,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -729,6 +733,7 @@ public final class UserConnection implements ProxiedPlayer public void setCompressionThreshold(int compressionThreshold) { @@ -1469,10 +1469,10 @@ index b4cbc3f3..6bfa4cb7 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 1f8a2439..8e1830e8 100644 +index 72133370..1043e4f2 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 -@@ -161,7 +161,7 @@ public class DownstreamBridge extends PacketHandler +@@ -163,7 +163,7 @@ public class DownstreamBridge extends PacketHandler switch ( objective.getAction() ) { case 0: @@ -1481,7 +1481,7 @@ index 1f8a2439..8e1830e8 100644 break; case 1: serverScoreboard.removeObjective( objective.getName() ); -@@ -171,7 +171,7 @@ public class DownstreamBridge extends PacketHandler +@@ -173,7 +173,7 @@ public class DownstreamBridge extends PacketHandler if ( oldObjective != null ) { oldObjective.setValue( objective.getValue() ); @@ -1490,7 +1490,7 @@ index 1f8a2439..8e1830e8 100644 } break; default: -@@ -268,16 +268,28 @@ public class DownstreamBridge extends PacketHandler +@@ -270,16 +270,28 @@ public class DownstreamBridge extends PacketHandler if ( pluginMessage.getTag().equals( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand" ) ) { @@ -1530,10 +1530,10 @@ index 1f8a2439..8e1830e8 100644 con.unsafe().sendPacket( pluginMessage ); throw CancelSendSignal.INSTANCE; diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 8e637718..f40f56b2 100644 +index 8e1b9a19..00a369d3 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -11,6 +11,13 @@ import java.util.List; +@@ -12,6 +12,13 @@ import java.util.List; import java.util.UUID; import java.util.logging.Level; import javax.crypto.SecretKey; @@ -1547,7 +1547,7 @@ index 8e637718..f40f56b2 100644 import lombok.Getter; import lombok.RequiredArgsConstructor; import net.md_5.bungee.BungeeCord; -@@ -232,12 +239,28 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -233,12 +240,28 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public void done(ProxyPingEvent pingResult, Throwable error) { @@ -1556,7 +1556,7 @@ index 8e637718..f40f56b2 100644 + Gson gson = handshake.getProtocolVersion() == ProtocolConstants.MINECRAFT_1_7_2 ? BungeeCord.getInstance().gsonLegacy : BungeeCord.getInstance().gson; // Travertine if ( bungee.getConnectionThrottle() != null ) { - bungee.getConnectionThrottle().unthrottle( getAddress().getAddress() ); + bungee.getConnectionThrottle().unthrottle( getSocketAddress() ); } + // Travertine start + if ( ProtocolConstants.isBeforeOrEq( handshake.getProtocolVersion() , ProtocolConstants.MINECRAFT_1_8 ) ) @@ -1578,7 +1578,7 @@ index 8e637718..f40f56b2 100644 } }; -@@ -520,7 +543,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -521,7 +544,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection userCon.setCompressionThreshold( BungeeCord.getInstance().config.getCompressionThreshold() ); userCon.init(); @@ -2004,5 +2004,5 @@ index daf12f74..e33861ab 100644 @Override -- -2.24.1 +2.25.0