Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-16 23:35:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #134 from Luccboy/update/1.19

Browse Source 
Updated Upstream (Waterfall)
This commit is contained in:
Juan Cruz Linsalata 2022-06-07 20:27:45 -03:00 committed by GitHub
commit 8380a7b28c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 191 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 2322301e636482f5eee44b7f7586a66408a502f4
Subproject commit 59dbd0833d2d681d65403819b0ead83094e18237

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

@ -1,4 +1,4 @@
From 9702193b1b27ffbe2fd79236b44d689d58ebafc1 Mon Sep 17 00:00:00 2001
From 78f08ffc6b5a3860c958d66ac3c469c39aff35ff Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 17:59:15 +0800
Subject: [PATCH] FlameCord POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] FlameCord POM Changes
diff --git a/flamecord/pom.xml b/flamecord/pom.xml
new file mode 100644
index 00000000..f4bf5ec6
index 00000000..20edd900
--- /dev/null
+++ b/flamecord/pom.xml
@@ -0,0 +1,44 @@
@ -17,13 +17,13 @@ index 00000000..f4bf5ec6
+ <parent>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
+ <version>1.18-R0.1-SNAPSHOT</version>
+ <version>1.19-R0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>dev._2lstudios</groupId>
+ <artifactId>waterfall-flamecord</artifactId>
+ <version>1.18-R0.1-SNAPSHOT</version>
+ <version>1.19-R0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Waterfall-FlameCord</name>
@ -55,7 +55,7 @@ index 00000000..f4bf5ec6
+ </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 505d1d14..45f14084 100644
index 2b544c23..d940b21c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,7 @@
@ -67,7 +67,7 @@ index 505d1d14..45f14084 100644
<scm>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index a783d9b0..f45d4f7a 100644
index 93ae5952..d6222d16 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -64,5 +64,14 @@
@ -86,7 +86,7 @@ index a783d9b0..f45d4f7a 100644
</dependencies>
</project>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index cca0ef95..3df0498a 100644
index 72b7f3a9..47fd853e 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -150,6 +150,51 @@
@ -140,7 +140,7 @@ index cca0ef95..3df0498a 100644
+ <!-- FlameCord end -->
</dependencies>
<build>
<!-- Waterfall start - copy license files into jar -->
--
2.32.0
2.36.1.windows.1

132
Waterfall-Proxy-Patches/0004-1.7.x-support.patch
View File

@ -1,14 +1,14 @@
From 8cb0f498248681df39f0802cacb07c3053d7f4cf Mon Sep 17 00:00:00 2001
From 00d921eca130b83c9460fcb3947ce4414803e907 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 30 Sep 2021 19:54:33 -0300
Subject: [PATCH] 1.7.x support
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index a310844d..d07b88b8 100644
index 55c6ee72..56684de7 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -303,4 +303,36 @@ public abstract class DefinedPacket
@@ -364,4 +364,36 @@ public abstract class DefinedPacket
return 0;
}
// Waterfall end
@ -46,10 +46,10 @@ index a310844d..d07b88b8 100644
+ // FlameCord end - 1.7.x support
}
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 7f0b71c9..04851233 100644
index 4a07e5be..56f01363 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
@@ -58,7 +58,7 @@ public enum Protocol
@@ -62,7 +62,7 @@ public enum Protocol
TO_SERVER.registerPacket(
Handshake.class,
Handshake::new,
@ -58,7 +58,7 @@ index 7f0b71c9..04851233 100644
);
}
},
@@ -70,7 +70,7 @@ public enum Protocol
@@ -74,7 +74,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
KeepAlive.class,
KeepAlive::new,
@ -67,7 +67,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x1F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x21 ),
map( ProtocolConstants.MINECRAFT_1_14, 0x20 ),
@@ -82,7 +82,7 @@ public enum Protocol
@@ -87,7 +87,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Login.class,
Login::new,
@ -76,16 +76,16 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x23 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x25 ),
map( ProtocolConstants.MINECRAFT_1_15, 0x26 ),
@@ -93,7 +93,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Chat.class,
@@ -98,7 +98,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket( Chat.class,
Chat::new,
- map( ProtocolConstants.MINECRAFT_1_8, 0x02 ),
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x02 ), // FlameCord - 1.7.x support
map( ProtocolConstants.MINECRAFT_1_9, 0x0F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x0E ),
map( ProtocolConstants.MINECRAFT_1_15, 0x0F ),
@@ -103,7 +103,7 @@ public enum Protocol
@@ -109,7 +109,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Respawn.class,
Respawn::new,
@ -94,7 +94,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x33 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x34 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x35 ),
@@ -126,20 +126,20 @@ public enum Protocol
@@ -139,20 +139,20 @@ public enum Protocol
TO_CLIENT.registerPacket(
EntityEffect.class,
EntityEffect::new,
@ -118,7 +118,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x2D ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ),
map( ProtocolConstants.MINECRAFT_1_13, 0x30 ),
@@ -152,7 +152,7 @@ public enum Protocol
@@ -166,7 +166,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
TabCompleteResponse.class,
TabCompleteResponse::new,
@ -127,7 +127,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x0E ),
map( ProtocolConstants.MINECRAFT_1_13, 0x10 ),
map( ProtocolConstants.MINECRAFT_1_15, 0x11 ),
@@ -163,7 +163,7 @@ public enum Protocol
@@ -178,7 +178,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
ScoreboardObjective.class,
ScoreboardObjective::new,
@ -136,7 +136,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x3F ),
map( ProtocolConstants.MINECRAFT_1_12, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x42 ),
@@ -175,7 +175,7 @@ public enum Protocol
@@ -190,7 +190,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
ScoreboardScore.class,
ScoreboardScore::new,
@ -145,7 +145,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x42 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x44 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x45 ),
@@ -187,7 +187,7 @@ public enum Protocol
@@ -202,7 +202,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
ScoreboardDisplay.class,
ScoreboardDisplay::new,
@ -154,7 +154,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x38 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x3A ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x3B ),
@@ -199,7 +199,7 @@ public enum Protocol
@@ -214,7 +214,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Team.class,
Team::new,
@ -163,7 +163,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x43 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x44 ),
@@ -211,7 +211,7 @@ public enum Protocol
@@ -226,7 +226,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
PluginMessage.class,
PluginMessage::new,
@ -172,7 +172,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x18 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x19 ),
map( ProtocolConstants.MINECRAFT_1_14, 0x18 ),
@@ -223,7 +223,7 @@ public enum Protocol
@@ -239,7 +239,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Kick.class,
Kick::new,
@ -181,7 +181,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x1A ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1B ),
map( ProtocolConstants.MINECRAFT_1_14, 0x1A ),
@@ -235,7 +235,7 @@ public enum Protocol
@@ -252,7 +252,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Title.class,
Title::new,
@ -190,7 +190,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_12, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x4B ),
@@ -265,7 +265,7 @@ public enum Protocol
@@ -288,7 +288,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
PlayerListHeaderFooter.class,
PlayerListHeaderFooter::new,
@ -199,7 +199,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x48 ),
map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x49 ),
@@ -280,7 +280,7 @@ public enum Protocol
@@ -304,7 +304,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
EntityStatus.class,
EntityStatus::new,
@ -208,7 +208,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x1B ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1C ),
map( ProtocolConstants.MINECRAFT_1_14, 0x1B ),
@@ -318,7 +318,7 @@ public enum Protocol
@@ -346,7 +346,7 @@ public enum Protocol
TO_SERVER.registerPacket(
KeepAlive.class,
KeepAlive::new,
@ -217,16 +217,16 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x0B ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x0B ),
@@ -330,7 +330,7 @@ public enum Protocol
TO_SERVER.registerPacket(
Chat.class,
@@ -358,7 +358,7 @@ public enum Protocol
);
TO_SERVER.registerPacket( Chat.class,
Chat::new,
- map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x01 ), // FlameCord - 1.7.x support
map( ProtocolConstants.MINECRAFT_1_9, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x03 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x02 ),
@@ -339,7 +339,7 @@ public enum Protocol
@@ -378,7 +378,7 @@ public enum Protocol
TO_SERVER.registerPacket(
TabCompleteRequest.class,
TabCompleteRequest::new,
@ -235,7 +235,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x01 ),
@@ -349,7 +349,7 @@ public enum Protocol
@@ -389,7 +389,7 @@ public enum Protocol
TO_SERVER.registerPacket(
ClientSettings.class,
ClientSettings::new,
@ -244,7 +244,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x04 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x05 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x04 ),
@@ -358,7 +358,7 @@ public enum Protocol
@@ -399,7 +399,7 @@ public enum Protocol
TO_SERVER.registerPacket(
PluginMessage.class,
PluginMessage::new,
@ -253,7 +253,7 @@ index 7f0b71c9..04851233 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x09 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0A ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x09 ),
@@ -376,23 +376,23 @@ public enum Protocol
@@ -418,23 +418,23 @@ public enum Protocol
TO_CLIENT.registerPacket(
StatusResponse.class,
StatusResponse::new,
@ -281,7 +281,7 @@ index 7f0b71c9..04851233 100644
);
}
},
@@ -404,22 +404,22 @@ public enum Protocol
@@ -446,22 +446,22 @@ public enum Protocol
TO_CLIENT.registerPacket(
Kick.class,
Kick::new,
@ -308,7 +308,7 @@ index 7f0b71c9..04851233 100644
);
TO_CLIENT.registerPacket(
LoginPayloadRequest.class,
@@ -430,12 +430,12 @@ public enum Protocol
@@ -472,12 +472,12 @@ public enum Protocol
TO_SERVER.registerPacket(
LoginRequest.class,
LoginRequest::new,
@ -324,7 +324,7 @@ index 7f0b71c9..04851233 100644
TO_SERVER.registerPacket(
LoginPayloadResponse.class,
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 6360818c..5e4f3d64 100644
index 164b544e..c12d2885 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,10 @@ public class ProtocolConstants
@ -338,7 +338,7 @@ index 6360818c..5e4f3d64 100644
public static final int MINECRAFT_1_8 = 47;
public static final int MINECRAFT_1_9 = 107;
public static final int MINECRAFT_1_9_1 = 108;
@@ -44,6 +48,7 @@ public class ProtocolConstants
@@ -45,6 +49,7 @@ public class ProtocolConstants
static
{
ImmutableList.Builder<String> supportedVersions = ImmutableList.<String>builder().add(
@ -346,8 +346,8 @@ index 6360818c..5e4f3d64 100644
"1.8.x",
"1.9.x",
"1.10.x",
@@ -57,6 +62,10 @@ public class ProtocolConstants
"1.18.x"
@@ -59,6 +64,10 @@ public class ProtocolConstants
"1.19.x"
);
ImmutableList.Builder<Integer> supportedVersionIds = ImmutableList.<Integer>builder().add(
+ // FlameCord start - 1.7.x support
@ -453,11 +453,11 @@ index a29524ca..86182cdd 100644
writeArray( publicKey, buf );
writeArray( verifyToken, buf );
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
index 53575ce0..52d7a5cc 100644
index 50bb52b1..b15f9e6a 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
@@ -22,6 +22,15 @@ public class EncryptionResponse extends DefinedPacket
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
+ // FlameCord start - 1.7.x support
@ -470,9 +470,9 @@ index 53575ce0..52d7a5cc 100644
+ // FlameCord end - 1.7.x support
+
sharedSecret = readArray( buf, 128 );
verifyToken = readArray( buf, 128 );
}
@@ -29,6 +38,15 @@ public class EncryptionResponse extends DefinedPacket
if ( protocolVersion < ProtocolConstants.MINECRAFT_1_19 || buf.readBoolean() )
{
@@ -35,6 +44,15 @@ public class EncryptionResponse extends DefinedPacket
@Override
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@ -486,8 +486,8 @@ index 53575ce0..52d7a5cc 100644
+ // FlameCord end - 1.7.x support
+
writeArray( sharedSecret, buf );
writeArray( verifyToken, buf );
}
if ( verifyToken != null )
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java
index d11a9ea9..0ed78a8c 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java
@ -622,10 +622,10 @@ index b004bc41..a8c3e773 100644
{
buf.writeLong( randomId );
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
index 551bd104..5aeae06c 100644
index 07fb3d79..7d03cd10 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
@@ -23,6 +23,11 @@ public class LoginSuccess extends DefinedPacket
@@ -25,6 +25,11 @@ public class LoginSuccess extends DefinedPacket
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@ -637,7 +637,7 @@ index 551bd104..5aeae06c 100644
if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16 )
{
uuid = readUUID( buf );
@@ -36,6 +41,11 @@ public class LoginSuccess extends DefinedPacket
@@ -42,6 +47,11 @@ public class LoginSuccess extends DefinedPacket
@Override
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@ -649,7 +649,7 @@ index 551bd104..5aeae06c 100644
if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16 )
{
writeUUID( uuid, buf );
@@ -51,4 +61,14 @@ public class LoginSuccess extends DefinedPacket
@@ -61,4 +71,14 @@ public class LoginSuccess extends DefinedPacket
{
handler.handle( this );
}
@ -665,10 +665,10 @@ index 551bd104..5aeae06c 100644
+ // FlameCord end - 1.7.x support
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
index 92bacc7c..cae5bda5 100644
index 7dfdb58d..4050acb4 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
@@ -21,6 +21,18 @@ public class PlayerListItem extends DefinedPacket
@@ -23,6 +23,18 @@ public class PlayerListItem extends DefinedPacket
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@ -687,7 +687,7 @@ index 92bacc7c..cae5bda5 100644
action = Action.values()[DefinedPacket.readVarInt( buf )];
items = new Item[ DefinedPacket.readVarInt( buf ) ];
for ( int i = 0; i < items.length; i++ )
@@ -75,6 +87,17 @@ public class PlayerListItem extends DefinedPacket
@@ -63,6 +75,17 @@ public class PlayerListItem extends DefinedPacket
@Override
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@ -915,7 +915,7 @@ index a5555f6a..09dc67f9 100644
buf.writeByte( mode );
if ( mode == 0 || mode == 2 )
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 11b62d81..5ef34fcb 100644
index 04af585e..66a8e82b 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -170,6 +170,14 @@ public class BungeeCord extends ProxyServer
@ -1000,7 +1000,7 @@ index 491cf1a1..6cd8ec3b 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 9e74d158..75028024 100644
index ba7fc59c..d672c8ef 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -280,10 +280,20 @@ public class ServerConnector extends PacketHandler
@ -1037,7 +1037,7 @@ index 9e74d158..75028024 100644
}
for ( Score score : serverScoreboard.getScores() )
{
@@ -465,7 +475,13 @@ public class ServerConnector extends PacketHandler
@@ -466,7 +476,13 @@ public class ServerConnector extends PacketHandler
if ( pluginMessage.getTag().equals( ForgeConstants.FML_HANDSHAKE_TAG ) || pluginMessage.getTag().equals( ForgeConstants.FORGE_REGISTER ) )
{
this.handshakeHandler.handle( pluginMessage );
@ -1053,10 +1053,10 @@ index 9e74d158..75028024 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 7c52ee9a..fe73e6e8 100644
index b7d363b8..0d0f4376 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
@@ -194,6 +194,7 @@ public final class UserConnection implements ProxiedPlayer
public void setDisplayName(String name)
{
Preconditions.checkNotNull( name, "displayName" );
@ -1064,7 +1064,7 @@ index 7c52ee9a..fe73e6e8 100644
displayName = name;
}
@@ -507,7 +508,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -518,7 +519,7 @@ public final class UserConnection implements ProxiedPlayer
// transform score components
message = ChatComponentTransformer.getInstance().transform( this, true, message );
@ -1073,7 +1073,7 @@ index 7c52ee9a..fe73e6e8 100644
{
// 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
@@ -703,6 +704,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -714,6 +715,7 @@ public final class UserConnection implements ProxiedPlayer
@Override
public void setTabHeader(BaseComponent header, BaseComponent footer)
{
@ -1081,7 +1081,7 @@ index 7c52ee9a..fe73e6e8 100644
header = ChatComponentTransformer.getInstance().transform( this, true, header )[0];
footer = ChatComponentTransformer.getInstance().transform( this, true, footer )[0];
@@ -715,6 +717,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -726,6 +728,7 @@ public final class UserConnection implements ProxiedPlayer
@Override
public void setTabHeader(BaseComponent[] header, BaseComponent[] footer)
{
@ -1089,7 +1089,7 @@ index 7c52ee9a..fe73e6e8 100644
header = ChatComponentTransformer.getInstance().transform( this, true, header );
footer = ChatComponentTransformer.getInstance().transform( this, true, footer );
@@ -744,6 +747,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -755,6 +758,7 @@ public final class UserConnection implements ProxiedPlayer
public void setCompressionThreshold(int compressionThreshold)
{
@ -1167,7 +1167,7 @@ index 97c4b210..6082d40c 100644
con.unsafe().sendPacket( pluginMessage );
throw CancelSendSignal.INSTANCE;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 4afab05d..f6378e03 100644
index c973ca63..134c8a1d 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -3,6 +3,9 @@ package net.md_5.bungee.connection;
@ -1180,7 +1180,7 @@ index 4afab05d..f6378e03 100644
import java.math.BigInteger;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
@@ -257,8 +260,23 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -259,8 +262,23 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void done(ProxyPingEvent pingResult, Throwable error)
{
@ -1228,10 +1228,10 @@ index 6df3f3dd..a409d440 100644
( (BungeeServerInfo) target ).cachePing( serverPing );
callback.done( serverPing, null );
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 9537208e..e354032a 100644
index b9a4b03c..5a3555a6 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -85,7 +85,12 @@ public class UpstreamBridge extends PacketHandler
@@ -87,7 +87,12 @@ public class UpstreamBridge extends PacketHandler
} );
for ( ProxiedPlayer player : con.getServer().getInfo().getPlayers() )
{
@ -1246,10 +1246,10 @@ index 9537208e..e354032a 100644
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
index cda6451d..1509071f 100644
index 59d63cc2..73fd60e0 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
@@ -35,6 +35,12 @@ public abstract class EntityMap
@@ -34,6 +34,12 @@ public abstract class EntityMap
// Waterfall end
switch ( version )
{
@ -1620,5 +1620,5 @@ index daf12f74..7d053485 100644
@Override
--
2.34.1
2.36.1.windows.1

8
Waterfall-Proxy-Patches/0005-Make-PlayerHandshakeEvent-cancellable.patch
View File

@ -1,4 +1,4 @@
From fe67e1b15da0cebd4aa08a848529845a194dff24 Mon Sep 17 00:00:00 2001
From dc40048d350211b27c7418575f25b5bc90325626 Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 17:57:23 +0800
Subject: [PATCH] Make PlayerHandshakeEvent cancellable
@ -35,10 +35,10 @@ index 2f7b38d9..e29b0ed3 100644
/**
* Connection attempting to login.
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index f6378e03..23571d40 100644
index 134c8a1d..3372fb71 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -338,7 +338,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -340,7 +340,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection
this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
@ -52,5 +52,5 @@ index f6378e03..23571d40 100644
switch ( handshake.getRequestedProtocol() )
{
--
2.32.0
2.36.1.windows.1

12
Waterfall-Proxy-Patches/0008-Change-replaceAll-to-replace.patch
View File

@ -1,23 +1,23 @@
From 6d9ca4241f7afcfba08144a7e247bfc36a4d5990 Mon Sep 17 00:00:00 2001
From dca52858df4acbd78c9128f6e40e447b86824150 Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:01:37 +0800
Subject: [PATCH] Change replaceAll() to replace()
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 75028024..2ee16684 100644
index d672c8ef..9067b806 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -129,7 +129,8 @@ public class ServerConnector extends PacketHandler
newp[newp.length - 2] = new LoginResult.Property( ForgeConstants.FML_LOGIN_PROFILE, "true", null );
newp[newp.length - 2] = new net.md_5.bungee.protocol.Property( ForgeConstants.FML_LOGIN_PROFILE, "true", null );
// If we do not perform the replacement, then the IP Forwarding code in Spigot et. al. will try to split on this prematurely.
- newp[newp.length - 1] = new LoginResult.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replaceAll( "\0", "\1"), "" );
- newp[newp.length - 1] = new net.md_5.bungee.protocol.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replaceAll( "\0", "\1"), "" );
+ // FlameCord - Change replaceAll() to replace()
+ newp[newp.length - 1] = new LoginResult.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replace( "\0", "\1"), "" );
+ newp[newp.length - 1] = new net.md_5.bungee.protocol.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replace( "\0", "\1"), "" );
// All done.
properties = newp;
--
2.32.0
2.36.1.windows.1

14
Waterfall-Proxy-Patches/0009-Close-connections-Don-t-flush-if-not-necessary.patch
View File

@ -1,14 +1,14 @@
From fe19c98e455af24d9970a73215de3b651545d919 Mon Sep 17 00:00:00 2001
From 3eb1986d6a7a41e141243a72281ca574cc258bca Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:06:17 +0800
Subject: [PATCH] Close connections & Don't flush if not necessary
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 23571d40..1ec75614 100644
index 3372fb71..02e36035 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -195,6 +195,13 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -197,6 +197,13 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
ServerPing legacy = result.getResponse();
@ -22,7 +22,7 @@ index 23571d40..1ec75614 100644
String kickMessage;
if ( v1_5 )
@@ -260,6 +267,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -262,6 +269,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void done(ProxyPingEvent pingResult, Throwable error)
{
@ -40,7 +40,7 @@ index 23571d40..1ec75614 100644
// FlameCord start - 1.7.x support
Gson gson = handshake.getProtocolVersion() == ProtocolConstants.MINECRAFT_1_7_2 ? BungeeCord.getInstance().gsonLegacy : BungeeCord.getInstance().gson;
if ( ProtocolConstants.isBeforeOrEq( handshake.getProtocolVersion() , ProtocolConstants.MINECRAFT_1_8 ) )
@@ -304,11 +322,13 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -306,11 +324,13 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void handle(PingPacket ping) throws Exception
{
@ -58,7 +58,7 @@ index 23571d40..1ec75614 100644
}
@Override
@@ -617,7 +637,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -644,7 +664,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
if ( canSendKickMessage() )
{
@ -175,5 +175,5 @@ index b2b19996..b1ecb7ef 100644
}
--
2.32.0
2.36.1.windows.1

8
Waterfall-Proxy-Patches/0014-Allow-custom-uuids-even-if-onlineMode-is-true.patch
View File

@ -1,14 +1,14 @@
From 78fe174f45379f66c5a409e723804bd147b6859f Mon Sep 17 00:00:00 2001
From e1a764e21fc1c6329271b609847e4850688ab05f Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:35:33 +0800
Subject: [PATCH] Allow custom uuids even if onlineMode is true
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 1ec75614..b402d1d3 100644
index 02e36035..faa548b2 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -695,7 +695,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -722,7 +722,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
public void setUniqueId(UUID uuid)
{
Preconditions.checkState( thisState == State.USERNAME, "Can only set uuid while state is username" );
@ -18,5 +18,5 @@ index 1ec75614..b402d1d3 100644
}
--
2.32.0
2.36.1.windows.1

8
Waterfall-Proxy-Patches/0015-Change-IllegalStateException-to-QuietException-and-e.patch
View File

@ -1,4 +1,4 @@
From 741f02f0787e16c9032d2a8490f669b69963dcda Mon Sep 17 00:00:00 2001
From 7b7896c320e69ce36355bd3c1b5e8c46465f25d9 Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:40:55 +0800
Subject: [PATCH] Change IllegalStateException to QuietException and explain
@ -6,10 +6,10 @@ Subject: [PATCH] Change IllegalStateException to QuietException and explain
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 adc25165..935d2e30 100644
index 0d0f4376..e183e1a1 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -311,7 +311,8 @@ public final class UserConnection implements ProxiedPlayer
@@ -312,7 +312,8 @@ public final class UserConnection implements ProxiedPlayer
if ( getServer() == null && !ch.isClosing() )
{
@ -20,5 +20,5 @@ index adc25165..935d2e30 100644
return;
}
--
2.32.0
2.36.1.windows.1

8
Waterfall-Proxy-Patches/0016-Don-t-declare-uuid-unless-it-s-null.patch
View File

@ -1,14 +1,14 @@
From 0ddd8121e5e1bb37c08836aef5189d3b4a4a8a7d Mon Sep 17 00:00:00 2001
From 09ed510ba131556b9b64e52d4adf1b5836f537fe Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:43:17 +0800
Subject: [PATCH] Don't declare uuid unless it's null
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index b402d1d3..0b5faf6b 100644
index faa548b2..fb9a8a19 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -505,7 +505,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -532,7 +532,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
loginProfile = obj;
name = obj.getName();
@ -21,5 +21,5 @@ index b402d1d3..0b5faf6b 100644
return;
}
--
2.32.0
2.36.1.windows.1

20
Waterfall-Proxy-Patches/0017-FlameCord-General-Patch.patch
View File

@ -1,4 +1,4 @@
From a102b1a867083a5fa6873b59eb015dfdddf651fd Mon Sep 17 00:00:00 2001
From fbb4acd9564930b3d9eec1617ab17c829106005a Mon Sep 17 00:00:00 2001
From: Juan Cruz Linsalata <LinsaFTW@users.noreply.github.com>
Date: Mon, 12 Oct 2020 15:40:53 -0300
Subject: [PATCH] FlameCord General Patch
@ -205,7 +205,7 @@ index 00000000..91d60bfb
+ }
+}
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 0b02ae7d..774439c5 100644
index 66a8e82b..8de74e78 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -9,6 +9,8 @@ import com.google.common.collect.Sets;
@ -263,7 +263,7 @@ index 0b02ae7d..774439c5 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 2ee16684..3a41769a 100644
index 9067b806..cb98a8ea 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -2,6 +2,8 @@ package net.md_5.bungee;
@ -285,7 +285,7 @@ index 2ee16684..3a41769a 100644
}
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 5cc50806..ff9fd071 100644
index e183e1a1..849ec128 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -35,6 +35,7 @@ import net.md_5.bungee.api.SkinConfiguration;
@ -296,7 +296,7 @@ index 5cc50806..ff9fd071 100644
import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.event.PermissionCheckEvent;
@@ -65,6 +66,7 @@ import net.md_5.bungee.tab.ServerUnique;
@@ -66,6 +67,7 @@ import net.md_5.bungee.tab.ServerUnique;
import net.md_5.bungee.tab.TabList;
import net.md_5.bungee.util.CaseInsensitiveSet;
import net.md_5.bungee.util.ChatComponentTransformer;
@ -304,7 +304,7 @@ index 5cc50806..ff9fd071 100644
@RequiredArgsConstructor
public final class UserConnection implements ProxiedPlayer
@@ -391,9 +393,11 @@ public final class UserConnection implements ProxiedPlayer
@@ -392,9 +394,11 @@ public final class UserConnection implements ProxiedPlayer
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, request.getConnectTimeout() )
.remoteAddress( target.getAddress() );
// Windows is bugged, multi homed users will just have to live with random connecting IPs
@ -319,10 +319,10 @@ index 5cc50806..ff9fd071 100644
b.connect().addListener( listener );
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 0b5faf6b..39c54cf1 100644
index fb9a8a19..c6d552e7 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -19,6 +19,8 @@ import java.util.logging.Level;
@@ -20,6 +20,8 @@ import java.util.logging.Level;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
@ -331,7 +331,7 @@ index 0b5faf6b..39c54cf1 100644
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
@@ -157,7 +159,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -159,7 +161,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
if ( packet.packet == null )
{
@ -379,5 +379,5 @@ index a95193ba..a4c3bd71 100644
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.Channel;
--
2.32.0
2.36.1.windows.1

8
Waterfall-Proxy-Patches/0020-Fix-ByteBuf-memory-leaks.patch
View File

@ -1,14 +1,14 @@
From 23d65a0daab152315d3815042c57d14e51674bb7 Mon Sep 17 00:00:00 2001
From 2553ca852c00716e467c00887160a0bdeaaaa36b Mon Sep 17 00:00:00 2001
From: linsaftw <linsaftw@users.noreply.github.com>
Date: Sat, 20 Mar 2021 12:36:25 -0300
Subject: [PATCH] Fix ByteBuf memory leaks
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 1509071f..b9bcecb5 100644
index 73fd60e0..9ec16808 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
@@ -151,11 +151,15 @@ public abstract class EntityMap
@@ -152,11 +152,15 @@ public abstract class EntityMap
if ( readId == oldId || readId == newId )
{
ByteBuf data = packet.copy();
@ -64,5 +64,5 @@ index cefa0206..8d4439ab 100644
}
--
2.32.0
2.36.1.windows.1

14
Waterfall-Proxy-Patches/0022-FlameCord-logger-options.patch
View File

@ -1,4 +1,4 @@
From 8b4d2b4a334c1c60e707e785f16dfc6422b02854 Mon Sep 17 00:00:00 2001
From 409d6c896abd462511e28f1932a124d9966de6e1 Mon Sep 17 00:00:00 2001
From: linsaftw <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 30 Apr 2021 23:51:51 -0300
Subject: [PATCH] FlameCord logger options
@ -40,7 +40,7 @@ index c8148e90..c327841a 100644
} catch (final IOException e) {
e.printStackTrace();
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 ff9fd071..849b4774 100644
index 849ec128..dd7c8532 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
@ -51,7 +51,7 @@ index ff9fd071..849b4774 100644
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@@ -404,7 +405,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -405,7 +406,10 @@ public final class UserConnection implements ProxiedPlayer
private String connectionFailMessage(Throwable cause)
{
@ -64,10 +64,10 @@ index ff9fd071..849b4774 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 39c54cf1..cfd6249e 100644
index c6d552e7..477ca39a 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -370,7 +370,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -372,7 +372,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
case 1:
// Ping
@ -77,7 +77,7 @@ index 39c54cf1..cfd6249e 100644
{
bungee.getLogger().log( Level.INFO, "{0} has pinged", this );
}
@@ -379,7 +380,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -381,7 +382,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
break;
case 2:
// Login
@ -139,5 +139,5 @@ index c8748ce5..778deb63 100644
{
if ( cause instanceof ReadTimeoutException )
--
2.32.0
2.36.1.windows.1

12
Waterfall-Proxy-Patches/0026-Custom-motd-system.patch
View File

@ -1,4 +1,4 @@
From 0253c8d3380bbee90deda46a1abfac43d326466d Mon Sep 17 00:00:00 2001
From d9798110ca3de1602a74372db57a5161cc07c382 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 7 Oct 2021 21:37:24 -0300
Subject: [PATCH] Custom motd system
@ -125,10 +125,10 @@ index c327841a..de2cc947 100644
this.loggerExceptions = setIfUnexistant("logger.exceptions", this.loggerExceptions, configuration);
this.loggerDump = setIfUnexistant("logger.dump", this.loggerDump, configuration);
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index cfd6249e..d1a06397 100644
index 477ca39a..e6b5e5da 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -21,6 +21,8 @@ import javax.crypto.spec.SecretKeySpec;
@@ -22,6 +22,8 @@ import javax.crypto.spec.SecretKeySpec;
import dev._2lstudios.flamecord.FlameCord;
@ -137,7 +137,7 @@ index cfd6249e..d1a06397 100644
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
@@ -250,7 +252,6 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -252,7 +254,6 @@ public class InitialHandler extends PacketHandler implements PendingConnection
Preconditions.checkState( thisState == State.STATUS, "Not expecting STATUS" );
ServerInfo forced = AbstractReconnectHandler.getForcedHost( this );
@ -145,7 +145,7 @@ index cfd6249e..d1a06397 100644
final int protocol = ( ProtocolConstants.SUPPORTED_VERSION_IDS.contains( handshake.getProtocolVersion() ) ) ? handshake.getProtocolVersion() : bungee.getProtocolVersion();
Callback<ServerPing> pingBack = new Callback<ServerPing>()
@@ -313,7 +314,52 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -315,7 +316,52 @@ public class InitialHandler extends PacketHandler implements PendingConnection
( (BungeeServerInfo) forced ).ping( pingBack, handshake.getProtocolVersion() );
} else
{
@ -200,5 +200,5 @@ index cfd6249e..d1a06397 100644
thisState = State.PING;
--
2.32.0
2.36.1.windows.1

26
Waterfall-Proxy-Patches/0028-InitialHandler-Processing-State.patch
View File

@ -1,14 +1,14 @@
From 2955e7fb79cc4a078a7290263cf86e2da94381f8 Mon Sep 17 00:00:00 2001
From 1dab3e8e846bfac8bb6c6bc2293e8a9839ba3f0b Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 25 Feb 2022 12:28:31 -0300
Subject: [PATCH] InitialHandler Processing State
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index d1a06397..0a09f92c 100644
index e6b5e5da..75956d4a 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -130,12 +130,12 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -132,12 +132,12 @@ public class InitialHandler extends PacketHandler implements PendingConnection
private enum State
{
@ -23,7 +23,7 @@ index d1a06397..0a09f92c 100644
}
@Override
@@ -250,6 +250,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -252,6 +252,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
public void handle(StatusRequest statusRequest) throws Exception
{
Preconditions.checkState( thisState == State.STATUS, "Not expecting STATUS" );
@ -31,7 +31,7 @@ index d1a06397..0a09f92c 100644
ServerInfo forced = AbstractReconnectHandler.getForcedHost( this );
final int protocol = ( ProtocolConstants.SUPPORTED_VERSION_IDS.contains( handshake.getProtocolVersion() ) ) ? handshake.getProtocolVersion() : bungee.getProtocolVersion();
@@ -372,6 +373,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -374,6 +375,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
// FlameCord - Never accept invalid packets
Preconditions.checkState( thisState == State.PING, "Not expecting PING" );
@ -39,7 +39,7 @@ index d1a06397..0a09f92c 100644
unsafe.sendPacket( ping );
@@ -383,6 +385,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -385,6 +387,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
public void handle(Handshake handshake) throws Exception
{
Preconditions.checkState( thisState == State.HANDSHAKE, "Not expecting HANDSHAKE" );
@ -47,7 +47,7 @@ index d1a06397..0a09f92c 100644
this.handshake = handshake;
ch.setVersion( handshake.getProtocolVersion() );
@@ -455,6 +458,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -457,6 +460,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
public void handle(LoginRequest loginRequest) throws Exception
{
Preconditions.checkState( thisState == State.USERNAME, "Not expecting USERNAME" );
@ -55,15 +55,7 @@ index d1a06397..0a09f92c 100644
if ( !AllowedCharacters.isValidName( loginRequest.getData(), onlineMode ) )
{
@@ -513,6 +517,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
public void handle(final EncryptionResponse encryptResponse) throws Exception
{
Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
+ thisState = State.PROCESSING;
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
// Waterfall start
@@ -740,14 +745,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -767,14 +771,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void setOnlineMode(boolean onlineMode)
{
@ -81,5 +73,5 @@ index d1a06397..0a09f92c 100644
this.uniqueId = uuid;
}
--
2.32.0
2.36.1.windows.1

26
Waterfall-Proxy-Patches/0029-Antibot-System.patch
View File

@ -1,11 +1,11 @@
From 0726de831401f203d43c432107da8a5bb0514edf Mon Sep 17 00:00:00 2001
From e422abdffacba77082117395fb7831a46cd5cad0 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 4 Mar 2022 13:35:53 -0300
Subject: [PATCH] Antibot System
diff --git a/flamecord/pom.xml b/flamecord/pom.xml
index f4bf5ec6..4a0d8e5d 100644
index 20edd900..5978bec6 100644
--- a/flamecord/pom.xml
+++ b/flamecord/pom.xml
@@ -30,6 +30,11 @@
@ -930,10 +930,10 @@ index 57462992..ee0295c7 100644
setIfUnexistant("flamecord_reload", "&aAll files had been successfully reloaded!", configuration);
setIfUnexistant("flamecord_help",
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 0a09f92c..f20acb2f 100644
index 75956d4a..716949ae 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -19,6 +19,8 @@ import java.util.logging.Level;
@@ -20,6 +20,8 @@ import java.util.logging.Level;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
@ -942,7 +942,7 @@ index 0a09f92c..f20acb2f 100644
import dev._2lstudios.flamecord.FlameCord;
import dev._2lstudios.flamecord.configuration.FlameConfig;
@@ -415,6 +417,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -417,6 +419,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection
return;
}
@ -954,7 +954,7 @@ index 0a09f92c..f20acb2f 100644
switch ( handshake.getRequestedProtocol() )
{
case 1:
@@ -426,6 +433,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -428,6 +435,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
thisState = State.STATUS;
ch.setProtocol( Protocol.STATUS );
@ -977,7 +977,7 @@ index 0a09f92c..f20acb2f 100644
break;
case 2:
// Login
@@ -437,6 +460,21 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -439,6 +462,21 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.USERNAME;
ch.setProtocol( Protocol.LOGIN );
@ -999,7 +999,7 @@ index 0a09f92c..f20acb2f 100644
if ( !ProtocolConstants.SUPPORTED_VERSION_IDS.contains( handshake.getProtocolVersion() ) )
{
if ( handshake.getProtocolVersion() > bungee.getProtocolVersion() )
@@ -474,6 +512,58 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -499,6 +537,58 @@ public class InitialHandler extends PacketHandler implements PendingConnection
return;
}
@ -1059,7 +1059,7 @@ index 0a09f92c..f20acb2f 100644
// We can just check by UUID here as names are based on UUID
if ( !isOnlineMode() && bungee.getPlayer( getUniqueId() ) != null )
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index e354032a..f5fc53bc 100644
index 5a3555a6..7dfff614 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -4,10 +4,15 @@ import com.google.common.base.Preconditions;
@ -1078,7 +1078,7 @@ index e354032a..f5fc53bc 100644
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.ServerConnection.KeepAliveData;
import net.md_5.bungee.UserConnection;
@@ -166,6 +171,32 @@ public class UpstreamBridge extends PacketHandler
@@ -192,6 +197,32 @@ public class UpstreamBridge extends PacketHandler
}
Preconditions.checkArgument(!empty, "Chat message is empty");
@ -1096,7 +1096,7 @@ index e354032a..f5fc53bc 100644
+ throw CancelSendSignal.INSTANCE;
+ }
+
+ if ( checkManager.getPasswordCheck().check( con.getCh().getRemoteAddress(), chat.getMessage() ) )
+ if ( checkManager.getPasswordCheck().check( con.getCh().getRemoteAddress(), message ) )
+ {
+ if ( FlameCord.getInstance().getFlameCordConfiguration().isAntibotPasswordLog() )
+ {
@ -1108,7 +1108,7 @@ index e354032a..f5fc53bc 100644
+ }
+ // FlameCord end - Antibot System
+
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
{
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@ -1154,5 +1154,5 @@ index ffea1599..6bf109f5 100644
{
ch.close();
--
2.34.1
2.36.1.windows.1

8
Waterfall-Proxy-Patches/0030-Allow-Invalid-Names.patch
View File

@ -1,4 +1,4 @@
From 478e6dc923312f50c739de42076d0c872925e506 Mon Sep 17 00:00:00 2001
From f1ef24bf5679ec5b5f06df202a1f3952a8f2f65e Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 4 Mar 2022 14:09:35 -0300
Subject: [PATCH] Allow Invalid Names
@ -29,10 +29,10 @@ index da3f915f..31631626 100644
this.tcpFastOpen = setIfUnexistant("tcp-fast-open", this.tcpFastOpen, configuration);
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 813f0e9b..7fa3217e 100644
index 716949ae..7c539248 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -498,7 +498,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -500,7 +500,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
Preconditions.checkState( thisState == State.USERNAME, "Not expecting USERNAME" );
thisState = State.PROCESSING_USERNAME;
@ -42,5 +42,5 @@ index 813f0e9b..7fa3217e 100644
disconnect( bungee.getTranslation( "name_invalid" ) );
return;
--
2.34.1
2.36.1.windows.1

63
Waterfall-Proxy-Patches/0032-Disable-entity-Metadata-Rewrite.patch
View File

@ -1,4 +1,4 @@
From 27d447c5af7941b6a84a2fed75d742a434a128f3 Mon Sep 17 00:00:00 2001
From c8a6949b1219f4c384d49f6db28a1b522ed4017c Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 10 Mar 2022 20:23:55 -0300
Subject: [PATCH] Disable entity Metadata Rewrite
@ -21,10 +21,10 @@ index 469fe0e1..97bd384b 100644
* Whether tablist rewriting should be disabled or not
* @return {@code true} if tablist rewriting is disabled, {@code false} otherwise
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
index ee2317e8..15a61b7e 100644
index 558d0dbb..35236382 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
@@ -8,8 +8,6 @@ import net.md_5.bungee.protocol.packet.ClientStatus;
@@ -10,8 +10,6 @@ import net.md_5.bungee.protocol.packet.ClientStatus;
import net.md_5.bungee.protocol.packet.Commands;
import net.md_5.bungee.protocol.packet.EncryptionRequest;
import net.md_5.bungee.protocol.packet.EncryptionResponse;
@ -33,7 +33,7 @@ index ee2317e8..15a61b7e 100644
import net.md_5.bungee.protocol.packet.EntityStatus;
import net.md_5.bungee.protocol.packet.GameState;
import net.md_5.bungee.protocol.packet.Handshake;
@@ -195,14 +193,4 @@ public abstract class AbstractPacketHandler
@@ -215,14 +213,4 @@ public abstract class AbstractPacketHandler
public void handle(GameState gameState) throws Exception
{
}
@ -49,10 +49,10 @@ index ee2317e8..15a61b7e 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 04851233..8e59720f 100644
index 56f01363..7b9303fc 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
@@ -18,8 +18,6 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
@@ -20,8 +20,6 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
import net.md_5.bungee.protocol.packet.EncryptionResponse;
import net.md_5.bungee.protocol.packet.EntityStatus;
import net.md_5.bungee.protocol.packet.GameState;
@ -61,9 +61,9 @@ index 04851233..8e59720f 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;
@@ -122,20 +120,6 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_16, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_17, 0x0D )
@@ -135,20 +133,6 @@ public enum Protocol
PlayerChat::new,
map( ProtocolConstants.MINECRAFT_1_19, 0x30 )
);
- // Waterfall start
- TO_CLIENT.registerPacket(
@ -239,7 +239,7 @@ index ff4bbf34..a008b132 100644
public boolean isDisableTabListRewrite() {
return disableTabListRewrite;
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 3a41769a..d2bf095a 100644
index cb98a8ea..c0b42ee2 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -243,11 +243,6 @@ public class ServerConnector extends PacketHandler
@ -281,7 +281,7 @@ index 3a41769a..d2bf095a 100644
user.setDimensionChange( true );
- if ( !user.isDisableEntityMetadataRewrite() && login.getDimension() == user.getDimension() ) // Waterfall - defer
- {
- user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
- user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) );
- }
user.setServerEntityId( login.getEntityId() );
@ -296,35 +296,35 @@ index 3a41769a..d2bf095a 100644
- // Only send if we are not in the same dimension
- if ( login.getDimension() != user.getDimension() ) // Waterfall - defer
- {
- user.unsafe().sendPacket( new Respawn( (Integer) user.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
- user.unsafe().sendPacket( new Respawn( (Integer) user.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) );
- }
+ // Only send if we are not in the same dimension
+ if ( login.getDimension() != user.getDimension() ) // Waterfall - defer
+ {
+ user.unsafe().sendPacket( new Respawn( (Integer) user.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
+ user.unsafe().sendPacket( new Respawn( (Integer) user.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) );
+ }
- Login modLogin = new Login( login.getEntityId(), login.isHardcore(), login.getGameMode(), login.getPreviousGameMode(), login.getWorldNames(), login.getDimensions(), login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(),
- (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat() );
- (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat(), login.getDeathLocation() );
- user.unsafe().sendPacket(modLogin);
+ Login modLogin = new Login( login.getEntityId(), login.isHardcore(), login.getGameMode(), login.getPreviousGameMode(), login.getWorldNames(), login.getDimensions(), login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(),
+ (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat() );
+ (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat(), login.getDeathLocation() );
+ user.unsafe().sendPacket(modLogin);
- // Only send if we're in the same dimension
- if ( login.getDimension() == user.getDimension() ) // Waterfall - defer
- {
- user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
- user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) );
- }
+ // Only send if we're in the same dimension
+ if ( login.getDimension() == user.getDimension() ) // Waterfall - defer
+ {
+ user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
+ user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) );
}
// Waterfall end
user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false, login.getDeathLocation() ) );
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 849b4774..6131d7ea 100644
index dd7c8532..3950ce42 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -44,7 +44,6 @@ import net.md_5.bungee.api.event.ServerConnectEvent;
@ -335,7 +335,7 @@ index 849b4774..6131d7ea 100644
import net.md_5.bungee.forge.ForgeClientHandler;
import net.md_5.bungee.forge.ForgeConstants;
import net.md_5.bungee.forge.ForgeServerHandler;
@@ -136,8 +135,6 @@ public final class UserConnection implements ProxiedPlayer
@@ -137,8 +136,6 @@ public final class UserConnection implements ProxiedPlayer
/*========================================================================*/
@Getter
private String displayName;
@ -344,7 +344,7 @@ index 849b4774..6131d7ea 100644
private Locale locale;
/*========================================================================*/
@Getter
@@ -158,8 +155,6 @@ public final class UserConnection implements ProxiedPlayer
@@ -159,8 +156,6 @@ public final class UserConnection implements ProxiedPlayer
public void init()
{
@ -353,7 +353,7 @@ index 849b4774..6131d7ea 100644
this.displayName = name;
tabListHandler = new ServerUnique( this );
@@ -776,10 +771,4 @@ public final class UserConnection implements ProxiedPlayer
@@ -787,10 +782,4 @@ public final class UserConnection implements ProxiedPlayer
{
return serverSentScoreboard;
}
@ -433,7 +433,7 @@ index 6082d40c..194ada04 100644
public void handle(Respawn respawn)
{
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 976c37e1..ec20e714 100644
index 7dfff614..9256477e 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -24,7 +24,6 @@ import net.md_5.bungee.api.event.PlayerDisconnectEvent;
@ -444,7 +444,7 @@ index 976c37e1..ec20e714 100644
import net.md_5.bungee.forge.ForgeConstants;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.PacketHandler;
@@ -128,11 +127,6 @@ public class UpstreamBridge extends PacketHandler
@@ -130,11 +129,6 @@ public class UpstreamBridge extends PacketHandler
{
if ( con.getServer() != null )
{
@ -458,10 +458,10 @@ index 976c37e1..ec20e714 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
deleted file mode 100644
index b9bcecb5..00000000
index 9ec16808..00000000
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ /dev/null
@@ -1,368 +0,0 @@
@@ -1,369 +0,0 @@
-package net.md_5.bungee.entitymap;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@ -470,7 +470,6 @@ index b9bcecb5..00000000
-import java.io.DataInputStream;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-
-import net.md_5.bungee.protocol.DefinedPacket;
-import net.md_5.bungee.protocol.ProtocolConstants;
-import se.llbit.nbt.NamedTag;
@ -550,6 +549,8 @@ index b9bcecb5..00000000
- case ProtocolConstants.MINECRAFT_1_18:
- case ProtocolConstants.MINECRAFT_1_18_2:
- return EntityMap_1_16_2.INSTANCE_1_18;
- case ProtocolConstants.MINECRAFT_1_19:
- return EntityMap_1_16_2.INSTANCE_1_19;
- }
- throw new RuntimeException( "Version " + version + " has no entity map" );
- }
@ -2355,10 +2356,10 @@ index c8b06707..00000000
-}
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16_2.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16_2.java
deleted file mode 100644
index 2f0e303d..00000000
index b9d0b651..00000000
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16_2.java
+++ /dev/null
@@ -1,74 +0,0 @@
@@ -1,76 +0,0 @@
-package net.md_5.bungee.entitymap;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@ -2378,6 +2379,8 @@ index 2f0e303d..00000000
- static final EntityMap_1_16_2 INSTANCE_1_16_2 = new EntityMap_1_16_2( 0x04, 0x2D );
- static final EntityMap_1_16_2 INSTANCE_1_17 = new EntityMap_1_16_2( 0x04, 0x2D );
- static final EntityMap_1_16_2 INSTANCE_1_18 = new EntityMap_1_16_2( 0x04, 0x2D );
- static final EntityMap_1_16_2 INSTANCE_1_19 = new EntityMap_1_16_2( 0x02, 0x2F );
-
- //
- private final int spawnPlayerId;
- private final int spectateId;
@ -3230,5 +3233,5 @@ index caed4384..af428090 100644
}
--
2.36.0.windows.1
2.36.1.windows.1