Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-20 07:19:23 +00:00
Code Issues Releases Activity

update to 1.21.4

Browse Source
This commit is contained in:
NONPLAYT
2024-12-05 00:25:45 +03:00
parent e58b0d08bf
commit f289fa4954
25 changed files with 88 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0031-Block-Log4Shell-exploit.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Block Log4Shell exploit
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 9ae16e24013ea5664d4ea6d52ed7dd188404890f..59d26f63fd6b6df86ae357be3fd530c1b9eb4394 100644
index 9947271607c2b28b6175334c22f08bf49f30fe4c..621202a01415dec318df62b4af1d2ef00c6b36b0 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2455,6 +2455,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2514,6 +2514,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
}
private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit
@@ -16,7 +16,7 @@ index 9ae16e24013ea5664d4ea6d52ed7dd188404890f..59d26f63fd6b6df86ae357be3fd530c1
if (ServerGamePacketListenerImpl.isChatMessageIllegal(s)) {
this.disconnectAsync((Component) Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper // Paper - add proper async disconnect
} else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
@@ -2486,6 +2487,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2545,6 +2546,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
}
}
@@ -33,7 +33,7 @@ index 9ae16e24013ea5664d4ea6d52ed7dd188404890f..59d26f63fd6b6df86ae357be3fd530c1
for (int i = 0; i < message.length(); ++i) {
if (!StringUtil.isAllowedChatCharacter(message.charAt(i))) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 63065a22ff359c142bab23fccacfd5ebd86f81a5..ab257415665d80a1fc7d877831fc74ad50a6790a 100644
index 22abd7c837fe35423bd0c9e94107d47156d09266..ee5b34c7d7ed68f87e2f5c1c786031043f462636 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -758,6 +758,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {