Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-26 18:47:43 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Waterfall)

Browse Source 
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:
eb03f06 Updated Upstream (BungeeCord)
This commit is contained in:
Shane Freeder 2021-05-12 16:41:35 +01:00
parent 944d63b640
commit 9279d02f84
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 8fdb6be79589080b3ebe1f6587892de9625ac55f Subproject commit eb03f0627de7b37b4d9b6f7f796ccb5e8d4fdd0a

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

@ -1,4 +1,4 @@
From bc92a3b1a1f14ed5b31b8baa82e17b4ede1d8bdf Mon Sep 17 00:00:00 2001 From 6f9d46148349b909fe4a49f5d65ca6d9f287e6cf Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 10:31:04 -0500 Date: Tue, 15 Nov 2016 10:31:04 -0500
Subject: [PATCH] 1.7.x Protocol Patch Subject: [PATCH] 1.7.x Protocol Patch
@ -1439,10 +1439,10 @@ index 2d9c0cda5..a4c255757 100644
throw CancelSendSignal.INSTANCE; 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 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 7ec119ea0..986a9d052 100644 index 01075a85e..96df01757 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -193,6 +193,7 @@ public final class UserConnection implements ProxiedPlayer @@ -196,6 +196,7 @@ public final class UserConnection implements ProxiedPlayer
public void setDisplayName(String name) public void setDisplayName(String name)
{ {
Preconditions.checkNotNull( name, "displayName" ); Preconditions.checkNotNull( name, "displayName" );
@ -1450,7 +1450,7 @@ index 7ec119ea0..986a9d052 100644
displayName = name; displayName = name;
} }
@@ -497,7 +498,8 @@ public final class UserConnection implements ProxiedPlayer @@ -500,7 +501,8 @@ public final class UserConnection implements ProxiedPlayer
// transform score components // transform score components
message = ChatComponentTransformer.getInstance().transform( this, true, message ); message = ChatComponentTransformer.getInstance().transform( this, true, message );
@ -1460,7 +1460,7 @@ index 7ec119ea0..986a9d052 100644
{ {
// Versions older than 1.11 cannot send the Action bar with the new JSON formattings // 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 // Fix by converting to a legacy message, see https://bugs.mojang.com/browse/MC-119145
@@ -693,6 +695,7 @@ public final class UserConnection implements ProxiedPlayer @@ -696,6 +698,7 @@ public final class UserConnection implements ProxiedPlayer
@Override @Override
public void setTabHeader(BaseComponent header, BaseComponent footer) public void setTabHeader(BaseComponent header, BaseComponent footer)
{ {
@ -1468,7 +1468,7 @@ index 7ec119ea0..986a9d052 100644
header = ChatComponentTransformer.getInstance().transform( this, true, header )[0]; header = ChatComponentTransformer.getInstance().transform( this, true, header )[0];
footer = ChatComponentTransformer.getInstance().transform( this, true, footer )[0]; footer = ChatComponentTransformer.getInstance().transform( this, true, footer )[0];
@@ -705,6 +708,7 @@ public final class UserConnection implements ProxiedPlayer @@ -708,6 +711,7 @@ public final class UserConnection implements ProxiedPlayer
@Override @Override
public void setTabHeader(BaseComponent[] header, BaseComponent[] footer) public void setTabHeader(BaseComponent[] header, BaseComponent[] footer)
{ {
@ -1476,7 +1476,7 @@ index 7ec119ea0..986a9d052 100644
header = ChatComponentTransformer.getInstance().transform( this, true, header ); header = ChatComponentTransformer.getInstance().transform( this, true, header );
footer = ChatComponentTransformer.getInstance().transform( this, true, footer ); footer = ChatComponentTransformer.getInstance().transform( this, true, footer );
@@ -734,6 +738,7 @@ public final class UserConnection implements ProxiedPlayer @@ -737,6 +741,7 @@ public final class UserConnection implements ProxiedPlayer
public void setCompressionThreshold(int compressionThreshold) public void setCompressionThreshold(int compressionThreshold)
{ {
@ -1637,7 +1637,7 @@ index 4d7b1b23e..ad3bdee56 100644
con.getServer().disconnect( "Quitting" ); 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 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 db93d8835..a3a12e19b 100644 index db5210d16..cd0bc5a9b 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -35,6 +35,10 @@ public abstract class EntityMap @@ -35,6 +35,10 @@ public abstract class EntityMap