Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-29 19:11:47 +01:00
Code Issues Projects Releases Wiki Activity

Update Waterfall

Browse Source
This commit is contained in:
Shane Freeder 2019-02-04 18:06:59 +00:00
parent c3accea68d
commit b72abd9de8
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
4 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit c74411e6ddc59ad6822336939da99e6bbf550416
Subproject commit 09ef1a561364327ffd90afeada86a49fb8881b97

8
Waterfall-Proxy-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 7c3eeb8ba477719096c376953dbd4d13d5c4293e Mon Sep 17 00:00:00 2001
From d757f1e65cbd592b2100d4844a7e4d45cf3ec4b0 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 08:56:43 -0500
Subject: [PATCH] POM Changes
@ -617,15 +617,15 @@ index f0497f59..d83cf34f 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
index e1cf0010..5637d4de 100644
index 9b20d0df..2637b9e2 100644
--- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
+++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
@@ -18,7 +18,7 @@ public class JenkinsModuleSource implements ModuleSource
System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
try
{
- URL website = new URL( "https://ci.destroystokyo.com/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
+ URL website = new URL( "https://ci.destroystokyo.com/job/Travertine/" + version.getBuild() + "/artifact/Travertine-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
- URL website = new URL( "https://papermc.io/ci/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
+ URL website = new URL( "https://papermc.io/ci/job/Travertine/" + version.getBuild() + "/artifact/Travertine-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
URLConnection con = website.openConnection();
// 15 second timeout at various stages
con.setConnectTimeout( 15000 );

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

@ -1,4 +1,4 @@
From 4c0346ac7c6d393270a7c6484fd8e92c1ac93fb9 Mon Sep 17 00:00:00 2001
From a61eb5686a6877101ef42987f90a559d43daa91c 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
@ -31,7 +31,7 @@ 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 c1c04995..670bcede 100644
index 4ff03488..79a3a145 100644
--- a/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
@ -43,7 +43,7 @@ index c1c04995..670bcede 100644
try
{
@@ -490,7 +490,7 @@ public class BungeeCord extends ProxyServer
@@ -496,7 +496,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getName()
{
@ -53,15 +53,15 @@ index c1c04995..670bcede 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 eeacd0c8..cd69896a 100644
index 3f52dad9..c9093462 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
if ( buildDate.before( deadline.getTime() ) )
{
System.err.println( "*** Hey! This build is potentially outdated :( ***" );
- System.err.println( "*** Please check for a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
+ System.err.println( "*** Please check for a new build from https://ci.destroystokyo.com/job/Travertine/ ***" );
- System.err.println( "*** Please check for a new build from https://papermc.io/ci/job/Waterfall/ ***" );
+ System.err.println( "*** Please check for a new build from https://papermc.io/ci/job/Travertine/ ***" );
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 ) );

40
Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch
View File

@ -1,4 +1,4 @@
From 6b73cdf9daa2c3795757035e54a2565003c1bf81 Mon Sep 17 00:00:00 2001
From 93a48cbe50e20969254791e3208b56b388940669 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
@ -223,7 +223,7 @@ index d9a3c7e5..67f2976e 100644
ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_9_1,
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
index 880a3dc7..bf8e3423 100644
index aef9fc37..f2c3b84f 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
@@ -7,10 +7,12 @@ import io.netty.handler.codec.ByteToMessageDecoder;
@ -239,8 +239,8 @@ index 880a3dc7..bf8e3423 100644
private static boolean DIRECT_WARNING;
// Waterfall start
private boolean allowEmptyPackets;
@@ -40,7 +42,15 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
int length = DefinedPacket.readVarInt( Unpooled.wrappedBuffer( buf ) );
@@ -42,7 +44,15 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
// Waterfall end
if ( length == 0 && !allowEmptyPackets) // Waterfall
{
- throw new CorruptedFrameException( "Empty Packet!" );
@ -996,7 +996,7 @@ index f93508d9..13af5112 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 bacf00f2..a196b994 100644
index 79a3a145..fdc23cc1 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
@ -1090,7 +1090,7 @@ 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 c7f081d4..41e26b9d 100644
index 110ac496..fc784b0f 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;
@ -1126,8 +1126,8 @@ index c7f081d4..41e26b9d 100644
user.setDimension( login.getDimension() );
} else
@@ -261,7 +272,7 @@ public class ServerConnector extends PacketHandler
Scoreboard serverScoreboard = user.getServerSentScoreboard();
@@ -262,7 +273,7 @@ public class ServerConnector extends PacketHandler
if ( !user.isDisableEntityMetadataRewrite() ) { // Waterfall
for ( Objective objective : serverScoreboard.getObjectives() )
{
- user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), objective.getValue(), ScoreboardObjective.HealthDisplay.fromString( objective.getType() ), (byte) 1 ) );
@ -1135,7 +1135,7 @@ index c7f081d4..41e26b9d 100644
}
for ( Score score : serverScoreboard.getScores() )
{
@@ -397,6 +408,14 @@ public class ServerConnector extends PacketHandler
@@ -414,6 +425,14 @@ public class ServerConnector extends PacketHandler
{
this.handshakeHandler.handle( pluginMessage );
@ -1151,7 +1151,7 @@ index c7f081d4..41e26b9d 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 9c872a1c..32830770 100644
index 8a524a64..67f7102d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -53,6 +53,7 @@ import net.md_5.bungee.protocol.MinecraftDecoder;
@ -1162,7 +1162,7 @@ index 9c872a1c..32830770 100644
import net.md_5.bungee.protocol.packet.Chat;
import net.md_5.bungee.protocol.packet.ClientSettings;
import net.md_5.bungee.protocol.packet.Kick;
@@ -194,6 +195,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -202,6 +203,7 @@ public final class UserConnection implements ProxiedPlayer
public void setDisplayName(String name)
{
Preconditions.checkNotNull( name, "displayName" );
@ -1170,7 +1170,7 @@ index 9c872a1c..32830770 100644
displayName = name;
}
@@ -476,7 +478,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -484,7 +486,7 @@ public final class UserConnection implements ProxiedPlayer
message = ChatComponentTransformer.getInstance().transform( this, message );
// Action bar doesn't display the new JSON formattings, legacy works - send it using this for now
@ -1179,7 +1179,7 @@ index 9c872a1c..32830770 100644
{
sendMessage( position, ComponentSerializer.toString( new TextComponent( BaseComponent.toLegacyText( message ) ) ) );
} else
@@ -491,7 +493,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -499,7 +501,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
@ -1188,7 +1188,7 @@ index 9c872a1c..32830770 100644
{
sendMessage( position, ComponentSerializer.toString( new TextComponent( BaseComponent.toLegacyText( message ) ) ) );
} else
@@ -670,6 +672,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -678,6 +680,7 @@ public final class UserConnection implements ProxiedPlayer
@Override
public void setTabHeader(BaseComponent header, BaseComponent footer)
{
@ -1196,7 +1196,7 @@ index 9c872a1c..32830770 100644
header = ChatComponentTransformer.getInstance().transform( this, header )[0];
footer = ChatComponentTransformer.getInstance().transform( this, footer )[0];
@@ -682,6 +685,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -690,6 +693,7 @@ public final class UserConnection implements ProxiedPlayer
@Override
public void setTabHeader(BaseComponent[] header, BaseComponent[] footer)
{
@ -1204,7 +1204,7 @@ index 9c872a1c..32830770 100644
header = ChatComponentTransformer.getInstance().transform( this, header );
footer = ChatComponentTransformer.getInstance().transform( this, footer );
@@ -711,6 +715,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -719,6 +723,7 @@ public final class UserConnection implements ProxiedPlayer
public void setCompressionThreshold(int compressionThreshold)
{
@ -1213,10 +1213,10 @@ index 9c872a1c..32830770 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 56c81262..9d07568d 100644
index 8469e665..e8c9762a 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
@@ -153,7 +153,7 @@ public class DownstreamBridge extends PacketHandler
@@ -160,7 +160,7 @@ public class DownstreamBridge extends PacketHandler
switch ( objective.getAction() )
{
case 0:
@ -1225,7 +1225,7 @@ index 56c81262..9d07568d 100644
break;
case 1:
serverScoreboard.removeObjective( objective.getName() );
@@ -163,7 +163,7 @@ public class DownstreamBridge extends PacketHandler
@@ -170,7 +170,7 @@ public class DownstreamBridge extends PacketHandler
if ( oldObjective != null )
{
oldObjective.setValue( objective.getValue() );
@ -1234,7 +1234,7 @@ index 56c81262..9d07568d 100644
}
break;
default:
@@ -260,16 +260,28 @@ public class DownstreamBridge extends PacketHandler
@@ -267,16 +267,28 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand" ) )
{