Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-10-01 07:57:31 +02: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:
331ebbf Add exception reporting event (#488)
This commit is contained in:
Shane Freeder 2020-05-07 15:35:51 +01:00
parent 11a06a690c
commit b1a03d01d3
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit a469ee5b41aed4ffa55f75cc960bd03dcf7ec165
Subproject commit 331ebbf4f6db6defcf0f59d3cdd0b656269c6194

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

@ -1,4 +1,4 @@
From 12235470dbce2859ddc3c8a01790b51629b985f7 Mon Sep 17 00:00:00 2001
From ca293a81f50c03c3ff52fcdb7eb477543722f8eb 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,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 a839cba5..f4bc9589 100644
index a963c748..e157374f 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -187,7 +187,7 @@ public class BungeeCord extends ProxyServer
@@ -189,7 +189,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 a839cba5..f4bc9589 100644
try
{
@@ -533,7 +533,7 @@ public class BungeeCord extends ProxyServer
@@ -539,7 +539,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getName()
{
@ -114,5 +114,5 @@ index 65121ba2..d4fad294 100644
SocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.25.0
2.26.1

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

@ -1,4 +1,4 @@
From a5bb288119b2c45e460c6ece1c24d37e0924d925 Mon Sep 17 00:00:00 2001
From e0c2ad90e1c91d7d950d85ceab8b9f5e3f2adf9d 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
@ -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 f4bc9589..37e33b38 100644
index e157374f..db8e9996 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -169,6 +169,14 @@ public class BungeeCord extends ProxyServer
@@ -171,6 +171,14 @@ public class BungeeCord extends ProxyServer
.registerTypeAdapter( SelectorComponent.class, new SelectorComponentSerializer() )
.registerTypeAdapter( ServerPing.PlayerInfo.class, new PlayerInfoSerializer() )
.registerTypeAdapter( Favicon.class, Favicon.getFaviconTypeAdapter() ).create();
@ -1414,7 +1414,7 @@ index 35a19224..53ef99cd 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 7c129221..6d547338 100644
index 87cff4ff..4891ec28 100644
--- a/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
@ -2004,5 +2004,5 @@ index daf12f74..e33861ab 100644
@Override
--
2.26.0
2.26.1