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

1.19.4 Support (#792)

Browse Source
This commit is contained in:
Juan Cruz Linsalata 2023-03-14 16:02:26 -03:00 committed by GitHub
parent 756aa03a7d
commit f26b0ffb69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 1b6d845530c1332ca5ed511c69e2611c3e0d65b0
Subproject commit f9712cbc7c9ec6295e4a5a646ead1dd0f2d7ed1a

20
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 644492a2dee5339f68f17a5931b203f2753bf8eb Mon Sep 17 00:00:00 2001
From abc4f5238300424500831e6ae531163cb82fda2a Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes
@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes
- Deploy to papermc mvn repo
diff --git a/api/pom.xml b/api/pom.xml
index cb42d641..601c195d 100644
index f49db317..863c353e 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -67,7 +67,7 @@ index cb42d641..601c195d 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 6e5c197d..cf7ef042 100644
index 06444181..c988cf5d 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -145,7 +145,7 @@ index 6be22739..a4516ed9 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index 4efc70d2..1a8b097d 100644
index f695c462..003b3f6c 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,19 +4,19 @@
@ -175,7 +175,7 @@ index 4efc70d2..1a8b097d 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 87c66f57..0b48084a 100644
index 807223ec..91da386a 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -506,7 +506,7 @@ index f7773d80..caa4c4cb 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 27f16b27..fad424b6 100644
index 00ec645a..57e35818 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -611,7 +611,7 @@ index 27f16b27..fad424b6 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
</plugin>
<plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
@ -624,7 +624,7 @@ index 27f16b27..fad424b6 100644
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.1</version>
@@ -154,6 +178,7 @@
</dependency>
</dependencies>
@ -772,7 +772,7 @@ index de6bd2e0..93ae5952 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 08d132e8..cf0a6a99 100644
index 7ef05886..eadd8464 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -884,5 +884,5 @@ index 5ea69b24..72eb14e2 100644
<scope>compile</scope>
</dependency>
--
2.37.1
2.37.3.windows.1

8
BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
View File

@ -1,14 +1,14 @@
From 59c0c10b00810eac449595aa6f96e35cc1a647c4 Mon Sep 17 00:00:00 2001
From af42b160de5d603752c202a28ff8328bad2036a6 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 09:07:51 -0500
Subject: [PATCH] Fixup ProtocolConstants
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 17d741d8..85f1b0b4 100644
index 580445d7..fa625d96 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
@@ -107,6 +107,16 @@ public class ProtocolConstants
@@ -109,6 +109,16 @@ public class ProtocolConstants
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
}
@ -26,5 +26,5 @@ index 17d741d8..85f1b0b4 100644
{
--
2.38.1
2.37.3.windows.1

12
BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From f8da61f6c957f1e32382087d12dad4b7ed26c6d4 Mon Sep 17 00:00:00 2001
From 8056d2b9940e8bcf664c633e97f1a4068308dfe3 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers
@ -37,10 +37,10 @@ index 773e954c..57bd22b7 100644
{
packet.read( in, prot.getDirection(), protocolVersion );
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index f746c4ff..52bc1ae7 100644
index 746defae..dabfa4db 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -627,14 +627,23 @@ public enum Protocol
@@ -655,14 +655,23 @@ public enum Protocol
return protocol;
}
@ -105,10 +105,10 @@ index d642e68d..bac51311 100644
@Getter
@NonNull
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 68c6ca2d..61ad307a 100644
index 81146df6..5ecca5a0 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -333,6 +333,12 @@ public abstract class EntityMap
@@ -335,6 +335,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -122,5 +122,5 @@ index 68c6ca2d..61ad307a 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.38.1
2.37.3.windows.1

8
BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 143303bff7299c8d2eca69429593c9c1373edd78 Mon Sep 17 00:00:00 2001
From 42c5c1b496b0fbd6b078f6df5ab94fed4455bb52 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Improve server list ping logging
@ -19,10 +19,10 @@ index aa721cdc..981b0200 100644
}
}
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 889e60c2..2e436999 100644
index b3fe9a64..f84554dd 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
@@ -707,6 +707,6 @@ public class DownstreamBridge extends PacketHandler
@@ -708,6 +708,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -69,5 +69,5 @@ index e87cd53a..c30093d7 100644
}
}
--
2.38.1
2.37.3.windows.1

14
BungeeCord-Patches/0031-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From a39c0b052c59de504031af65d96d6d0158f6405f Mon Sep 17 00:00:00 2001
From ffc7cfe376ea12c3232492bcaad76e04c6b138db Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -33,7 +33,7 @@ index 88865b85..0c334afc 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 52bc1ae7..e15926d3 100644
index dabfa4db..7e0c4f7a 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -20,6 +20,8 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
@ -45,9 +45,9 @@ index 52bc1ae7..e15926d3 100644
import net.md_5.bungee.protocol.packet.Handshake;
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick;
@@ -136,6 +138,20 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_17, 0x0D ),
map( ProtocolConstants.MINECRAFT_1_19, 0x0A )
@@ -140,6 +142,20 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_19, 0x0A ),
map( ProtocolConstants.MINECRAFT_1_19_4, 0xB )
);
+ // Waterfall start
+ TO_CLIENT.registerPacket(
@ -185,7 +185,7 @@ index 846f8338..7fe08ecd 100644
@Getter
private String displayName;
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 c5217561..85628a7a 100644
index e8ef17a1..c7180803 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
@@ -51,6 +51,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
@ -268,5 +268,5 @@ index d15044f4..bea2bbff 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.38.1
2.37.3.windows.1

8
BungeeCord-Patches/0039-Add-console-command-completion.patch
View File

@ -1,4 +1,4 @@
From 43359298fc34770dcd63045ccff96b55630dfa4b Mon Sep 17 00:00:00 2001
From eb704457c300f3f8ab8a28a784a926e746554119 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 26 Sep 2017 18:59:37 +0200
Subject: [PATCH] Add console command completion
@ -7,10 +7,10 @@ Register command completer for JLine to complete command names and
command arguments (if supported).
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
index c122cad9..4180c995 100644
index a8b21559..c11ce8d3 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
@@ -220,6 +220,41 @@ public final class PluginManager
@@ -221,6 +221,41 @@ public final class PluginManager
return true;
}
@ -102,5 +102,5 @@ index 765d24bc..6cec0b5a 100644
}
--
2.30.1 (Apple Git-130)
2.37.3.windows.1

10
BungeeCord-Patches/0045-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From 8be8d4cde11d6f17fc38ab464cdd01fc247080fa Mon Sep 17 00:00:00 2001
From 201c5254e561f61e44afe7854dc6d2a111963cf1 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 14 Jan 2019 03:35:21 +0000
Subject: [PATCH] Provide an option to disable entity metadata rewriting
@ -140,7 +140,7 @@ index 7fe08ecd..5961392a 100644
+ // Waterfall end
}
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 85628a7a..5105df8b 100644
index c7180803..04840037 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
@@ -688,6 +688,7 @@ public class DownstreamBridge extends PacketHandler
@ -160,7 +160,7 @@ index 85628a7a..5105df8b 100644
}
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 61ad307a..ad951df0 100644
index 5ecca5a0..28d2127f 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -27,6 +27,11 @@ public abstract class EntityMap
@ -175,7 +175,7 @@ index 61ad307a..ad951df0 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -295,7 +300,13 @@ public abstract class EntityMap
@@ -297,7 +302,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:
@ -228,5 +228,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.38.1
2.37.3.windows.1

20
BungeeCord-Patches/0051-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From a840443d6e16750852e70f923f07a1576937799e Mon Sep 17 00:00:00 2001
From d3707353a4b8be0fa47a5fa155bb44520914a383 Mon Sep 17 00:00:00 2001
From: theminecoder <theminecoder.dev@gmail.com>
Date: Wed, 22 Apr 2020 14:00:44 +1000
Subject: [PATCH] Add exception reporting event
@ -446,7 +446,7 @@ index 00000000..5bf57ec1
+ }
+}
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
index 4180c995..90031156 100644
index c11ce8d3..1ba5b249 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
@@ -26,6 +26,11 @@ import java.util.Stack;
@ -461,15 +461,15 @@ index 4180c995..90031156 100644
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender;
@@ -33,6 +38,7 @@ import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -34,6 +39,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.event.EventBus;
import net.md_5.bungee.event.EventHandler;
import org.yaml.snakeyaml.LoaderOptions;
+import net.md_5.bungee.event.EventHandlerMethod; //Waterfall - Exception event
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.introspector.PropertyUtils;
@@ -193,10 +199,9 @@ public final class PluginManager
@@ -194,10 +200,9 @@ public final class PluginManager
}
String[] args = Arrays.copyOfRange( split, 1, split.length );
@ -481,7 +481,7 @@ index 4180c995..90031156 100644
if ( proxy.getConfig().isLogCommands() )
{
proxy.getLogger().log( Level.INFO, "{0} executed command: /{1}", new Object[]
@@ -205,18 +210,28 @@ public final class PluginManager
@@ -206,18 +211,28 @@ public final class PluginManager
} );
}
command.execute( sender, args );
@ -513,7 +513,7 @@ index 4180c995..90031156 100644
return true;
}
@@ -304,7 +319,11 @@ public final class PluginManager
@@ -305,7 +320,11 @@ public final class PluginManager
} );
} catch ( Throwable t )
{
@ -526,7 +526,7 @@ index 4180c995..90031156 100644
}
}
}
@@ -444,7 +463,7 @@ public final class PluginManager
@@ -445,7 +464,7 @@ public final class PluginManager
Preconditions.checkNotNull( event, "event" );
long start = System.nanoTime();
@ -535,7 +535,7 @@ index 4180c995..90031156 100644
event.postCall();
long elapsed = System.nanoTime() - start;
@@ -458,6 +477,14 @@ public final class PluginManager
@@ -459,6 +478,14 @@ public final class PluginManager
return event;
}
@ -695,5 +695,5 @@ index 38b75b51..02ec98fc 100644
// If we have a period of 0 or less, only run once
--
2.38.1
2.37.3.windows.1

8
BungeeCord-Patches/0063-Add-protocol-version-to-packet-not-found-message.patch
View File

@ -1,4 +1,4 @@
From 467efc579e812d1c490ccd3ec45254f899303c0f Mon Sep 17 00:00:00 2001
From 07827a2a1caaa1a86a044e3071bcec6c90be1ac0 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 12 Jun 2022 06:45:54 +0100
Subject: [PATCH] Add protocol version to packet not found message
@ -6,7 +6,7 @@ Subject: [PATCH] Add protocol version to packet not found message
Also avoids a double get, but, this is probably trivial
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index e15926d3..2357f380 100644
index 7e0c4f7a..8bf14d56 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -2,6 +2,8 @@ package net.md_5.bungee.protocol;
@ -18,7 +18,7 @@ index e15926d3..2357f380 100644
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TIntObjectHashMap;
@@ -713,9 +715,12 @@ public enum Protocol
@@ -741,9 +743,12 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}
@ -34,5 +34,5 @@ index e15926d3..2357f380 100644
}
}
--
2.38.1
2.37.3.windows.1