mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-12-27 11:07:39 +01:00
Updated Upstream (BungeeCord) (#579)
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 BungeeCord Changes: 9c078b78 #2985: Add Keybinds.SOCIAL_INTERACTIONS 281aecef Minecraft 1.16.4 support
This commit is contained in:
Olivia
GitHub
parent
72503bfab4
commit
c617bbf0c6
@ -1,15 +1,15 @@
|
||||
From 0c66158378f219a83d0a50443126c910c88b6fb3 Mon Sep 17 00:00:00 2001
|
||||
From d999240c7a6c80605cd508cf23bfd3c01cddbce2 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 da207d5f..f33bb5c4 100644
|
||||
index bf316417..2202c4d3 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
|
||||
@@ -72,6 +72,16 @@ public class ProtocolConstants
|
||||
ProtocolConstants.MINECRAFT_1_16_3
|
||||
@@ -74,6 +74,16 @@ public class ProtocolConstants
|
||||
ProtocolConstants.MINECRAFT_1_16_4
|
||||
);
|
||||
|
||||
+ public static final boolean isBeforeOrEq(int before, int other)
|
||||
@ -26,5 +26,5 @@ index da207d5f..f33bb5c4 100644
|
||||
{
|
||||
|
||||
--
|
||||
2.28.0
|
||||
2.29.2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From e1787f7073ead26b908679285f5b58d684fa7526 Mon Sep 17 00:00:00 2001
|
||||
From 04107f2b83ed39c27c21936d2c1b4d129e1a52c6 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
|
||||
@ -93,7 +93,7 @@ index 3a24c100..eb8ae99a 100644
|
||||
|
||||
ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
|
||||
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 99af41b3..69a44db1 100644
|
||||
index e0b48763..b64d3f50 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
@@ -72,6 +72,7 @@ public final class UserConnection implements ProxiedPlayer
|
||||
@ -105,10 +105,10 @@ index 99af41b3..69a44db1 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 c5f45f84..cb94fa4a 100644
|
||||
index 53911d1c..4a27148f 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
|
||||
@@ -321,6 +321,12 @@ public abstract class EntityMap
|
||||
@@ -322,6 +322,12 @@ public abstract class EntityMap
|
||||
int packetId = DefinedPacket.readVarInt( packet );
|
||||
int packetIdLength = packet.readerIndex() - readerIndex;
|
||||
|
||||
@ -122,5 +122,5 @@ index c5f45f84..cb94fa4a 100644
|
||||
{
|
||||
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
|
||||
--
|
||||
2.28.0
|
||||
2.29.2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From e0314827c9cbf1d3ad1554bdf1a92928e420dc02 Mon Sep 17 00:00:00 2001
|
||||
From 8ae1e11318da696e5ef26a771ffad961adb17931 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
|
||||
@ -158,7 +158,7 @@ index 033877fc..72b6e9be 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 cb94fa4a..a5acf512 100644
|
||||
index 4a27148f..db93d883 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
|
||||
@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufInputStream;
|
||||
@ -181,7 +181,7 @@ index cb94fa4a..a5acf512 100644
|
||||
switch ( version )
|
||||
{
|
||||
case ProtocolConstants.MINECRAFT_1_8:
|
||||
@@ -283,7 +289,13 @@ public abstract class EntityMap
|
||||
@@ -284,7 +290,13 @@ public abstract class EntityMap
|
||||
DefinedPacket.readVarInt( packet );
|
||||
break;
|
||||
default:
|
||||
@ -234,5 +234,5 @@ index 00000000..cb81d1dd
|
||||
+// Waterfall end
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.29.0.windows.1
|
||||
2.29.2
|
||||
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
From d415b9e85fe6e7fc17328ce06e31faa276cb545e Mon Sep 17 00:00:00 2001
|
||||
From: Shane Freeder <theboyetronic@gmail.com>
|
||||
Date: Mon, 2 Nov 2020 19:02:31 +0000
|
||||
Subject: [PATCH] Preliminary 1.16.4 protocol support
|
||||
|
||||
|
||||
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 f33bb5c4..30b4d059 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
|
||||
@@ -32,6 +32,7 @@ public class ProtocolConstants
|
||||
public static final int MINECRAFT_1_16_1 = 736;
|
||||
public static final int MINECRAFT_1_16_2 = 751;
|
||||
public static final int MINECRAFT_1_16_3 = 753;
|
||||
+ public static final int MINECRAFT_1_16_4 = 754; // Waterfall
|
||||
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
|
||||
"1.8.x",
|
||||
"1.9.x",
|
||||
@@ -69,7 +70,8 @@ public class ProtocolConstants
|
||||
ProtocolConstants.MINECRAFT_1_16,
|
||||
ProtocolConstants.MINECRAFT_1_16_1,
|
||||
ProtocolConstants.MINECRAFT_1_16_2,
|
||||
- ProtocolConstants.MINECRAFT_1_16_3
|
||||
+ ProtocolConstants.MINECRAFT_1_16_3, // Waterfall
|
||||
+ ProtocolConstants.MINECRAFT_1_16_4 // Waterfall
|
||||
);
|
||||
|
||||
public static final boolean isBeforeOrEq(int before, int other)
|
||||
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 a5acf512..84c20c68 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
|
||||
@@ -72,6 +72,7 @@ public abstract class EntityMap
|
||||
return EntityMap_1_16.INSTANCE;
|
||||
case ProtocolConstants.MINECRAFT_1_16_2:
|
||||
case ProtocolConstants.MINECRAFT_1_16_3:
|
||||
+ case ProtocolConstants.MINECRAFT_1_16_4: // Waterfall
|
||||
return EntityMap_1_16_2.INSTANCE;
|
||||
}
|
||||
throw new RuntimeException( "Version " + version + " has no entity map" );
|
||||
--
|
||||
2.28.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user