Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-02-05 14:31:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'PaperMC:master' into master

Browse Source
This commit is contained in:
Juan Cruz Linsalata 2021-05-21 12:36:13 -03:00
commit 4b4b917223
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit ab893721bd3b6e12ee9c8cf31532079d4730583a
Subproject commit 5d64a21724a931a651b21191b8785ed65bbca489

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

@ -1,4 +1,4 @@
From ef7431f941bfb199bc715598d33928cfa6acd98c Mon Sep 17 00:00:00 2001
From a5f023bb3c21941eaf45f1c8946b719d0752590e 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
@ -53,10 +53,10 @@ index c09f5b4c3..97de4271c 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 771b37258..6a5193feb 100644
index 356805285..1c2628d31 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -71,7 +71,7 @@ public class BungeeCordLauncher
@@ -76,7 +76,7 @@ public class BungeeCordLauncher
BungeeCord bungee = new BungeeCord();
ProxyServer.setInstance( bungee );

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

@ -1,4 +1,4 @@
From 149ae54e143d770bc04b5cc1c358210abf77160f Mon Sep 17 00:00:00 2001
From 6e2a427f8fc248bd661af13272a4922a2e0ba94d 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
@ -445,7 +445,7 @@ index d2a11a826..2cc0f825b 100644
java.util.function.Supplier<? extends DefinedPacket> constructor = protocolData.packetConstructors[id]; // Waterfall - speed up packet construction
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
index 391443ca9..6cc77635b 100644
index 8c3a78d60..4f447bbf4 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -7,6 +7,8 @@ public class ProtocolConstants
@ -509,7 +509,7 @@ index c0d371426..a07e25b1f 100644
if ( in.readableBytes() < length )
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
index 828a5dbe6..195ec0886 100644
index c387802dd..1b1d263ce 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
@@ -1,5 +1,6 @@
@ -542,7 +542,7 @@ index 828a5dbe6..195ec0886 100644
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
@@ -56,6 +64,14 @@ public class Chat extends DefinedPacket
@@ -57,6 +65,14 @@ public class Chat extends DefinedPacket
}
}
@ -558,7 +558,7 @@ index 828a5dbe6..195ec0886 100644
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java
index 886cb9168..e453d36c9 100644
index 29440533f..c7b2e310d 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java
@@ -1,5 +1,7 @@
@ -1152,7 +1152,7 @@ index 0b27fc86b..74066702c 100644
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
index 3e4ea1928..421805e6e 100644
index 88d631cd0..ac8672470 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
@@ -1,5 +1,6 @@