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

Updated Upstream (Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@2a50638 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-09-30 23:33:37 +03:00
parent 8c3ef92b92
commit 440fbe12be
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0037-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 50b4e3fb244b8bac1a6a6d90aaf3b4be075b2500..4e844772b0343633ba44299544e77c012a1de888 100644
index 682f353c0e409fcc7375efc62d9f64b4952ff230..5fafd0e97c27cd92c6dd1e1cb3a68a290e15353e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2424,6 +2424,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2432,6 +2432,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
}
private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit
@@ -16,7 +16,7 @@ index 50b4e3fb244b8bac1a6a6d90aaf3b4be075b2500..4e844772b0343633ba44299544e77c01
if (ServerGamePacketListenerImpl.isChatMessageIllegal(s)) {
this.disconnect((Component) 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
@@ -2455,6 +2456,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2463,6 +2464,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
}
}
@@ -33,7 +33,7 @@ index 50b4e3fb244b8bac1a6a6d90aaf3b4be075b2500..4e844772b0343633ba44299544e77c01
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 37fc08d04ff3514d27ad25c8d774a6e96b30c3b1..3ab958a84a8f13eeaa5f3d6003d1d389fccd5384 100644
index 173e4a075078af67f030750c9a6294ab3f796677..370612b9c787104f346760978179f853c210ee0a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -751,6 +751,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {