mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-22 16:29:23 +00:00
1.21.6 (#25)
* start 1.21.6 update * change workflow * apply some patches * set experimental to true * some compile fixes * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@5d3463aa Updated Upstream (Paper) * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@5d3463aa Updated Upstream (Paper) * remove data converter for 1.21.6; move clumps to unapplied * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly * Update upstream * Update upstream * update to 1.21.6-pre4 * update patches * fix compile * set readme version to 1.21.6 * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@439f15db Updated Upstream (Paper) PurpurMC/Purpur@46a28b93 [ci/skip] update version in README
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Block Log4Shell exploit
|
||||
|
||||
|
||||
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 376ae7bde8fdf0efed5a7d33f67a1a5ae3b5e6e7..ce8255db82335255313e16b9811bdfc39d33e5ee 100644
|
||||
index 672995a6fb8c0f9e9155aa6f48edb1a52fd5cade..2858bd6c456e95adf80bb251044659e9e5c21700 100644
|
||||
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -2482,6 +2482,7 @@ public class ServerGamePacketListenerImpl
|
||||
@@ -2516,6 +2516,7 @@ public class ServerGamePacketListenerImpl
|
||||
}
|
||||
|
||||
private void tryHandleChat(String message, Runnable handler, boolean sync) { // CraftBukkit
|
||||
@@ -16,7 +16,7 @@ index 376ae7bde8fdf0efed5a7d33f67a1a5ae3b5e6e7..ce8255db82335255313e16b9811bdfc3
|
||||
if (isChatMessageIllegal(message)) {
|
||||
this.disconnectAsync(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper - add proper async disconnect
|
||||
} else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
|
||||
@@ -2514,6 +2515,15 @@ public class ServerGamePacketListenerImpl
|
||||
@@ -2548,6 +2549,15 @@ public class ServerGamePacketListenerImpl
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user