Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-23 08:59:23 +00:00
Code Issues Releases Activity

Updated Upstream (Gale/Purpur)

Browse Source
This commit is contained in:
Dreeam
2024-05-07 08:32:10 -04:00
parent 234d7e311a
commit b81d95630e
20 changed files with 282 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0062-Block-log4j-rce-exploit-in-chat.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Block log4j rce exploit in chat
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 492de69a877318bad5e49fb57ee461974ad562b6..7aa64742d7967a74e4078af168b6b2bac005ccd1 100644
index 5fe21ffe8a868184b909e444798701fab52e91c1..b4bab818c53c31bba220996696406a05cb57db8b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2418,6 +2418,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2444,6 +2444,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
}
private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit
@@ -17,7 +17,7 @@ index 492de69a877318bad5e49fb57ee461974ad562b6..7aa64742d7967a74e4078af168b6b2ba
if (ServerGamePacketListenerImpl.isChatMessageIllegal(s)) {
this.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper
} else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
@@ -2449,6 +2451,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2475,6 +2477,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
}
}
@@ -34,10 +34,10 @@ index 492de69a877318bad5e49fb57ee461974ad562b6..7aa64742d7967a74e4078af168b6b2ba
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 ea784b6c5aeb156147900ad6161c52cc185825dd..f4e916c3f38900576df974269ec5c88648a29eac 100644
index 65105a4fc797c9d7767fa9f837d9cef08f3f46ab..059aebbe2173bfc77071fad0884d92ebe756f848 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -742,6 +742,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -751,6 +751,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (this.getHandle().connection == null) return;