From 9aa8f44b16319703ae3d1d3bde5bc90b67834ba5 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Wed, 21 Aug 2024 02:01:35 +0300 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@c4a6f63 Updated Upstream (Paper) PurpurMC/Purpur@568a028 Updated Upstream (Paper) --- gradle.properties | 2 +- patches/api/0002-Divine-Configuration.patch | 4 ++-- .../server/0003-Optimize-default-values-for-configs.patch | 4 ++-- patches/server/0028-Delete-Timings.patch | 4 ++-- patches/server/0037-Block-Log4Shell-exploit.patch | 6 +++--- .../0055-Option-to-disable-moved-wrongly-threshold.patch | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index 91b7c41..3a52566 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = space.bxteam.divinemc mcVersion = 1.21.1 version = 1.21.1-R0.1-SNAPSHOT -purpurRef = 1d3cef7f4b2ebd21ee5c59f1b89bc151d26db226 +purpurRef = 568a028f8c33ad919f01c85a7fac5a9aced3d614 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0002-Divine-Configuration.patch b/patches/api/0002-Divine-Configuration.patch index 626c169..cb186ee 100644 --- a/patches/api/0002-Divine-Configuration.patch +++ b/patches/api/0002-Divine-Configuration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Divine Configuration diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 1d594c256200d46882fafce5d2b33e60f0fa3a59..b320778f75a31d05db3e426ffd9cb2c53831f5b7 100644 +index 84b07a7fd7941b2f75b531646b67a124a0607390..10b3a0b42f1c3fca9714b578cbb20ad727a4d5bb 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2266,6 +2266,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2277,6 +2277,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi } // Purpur end diff --git a/patches/server/0003-Optimize-default-values-for-configs.patch b/patches/server/0003-Optimize-default-values-for-configs.patch index c13d32b..1d0b2f9 100644 --- a/patches/server/0003-Optimize-default-values-for-configs.patch +++ b/patches/server/0003-Optimize-default-values-for-configs.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Optimize default values for configs diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 214ea75502d4abf9ebbc99a3811e4d2f8465227e..70ae8cd69935d6bc446bb3e425c7982b6fd1c978 100644 +index 690086adcb1f87adc0b3ab664fde735ad3e1093a..e5eecd15040d4c0a7c8a0de166e5dddb84f35974 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -338,9 +338,9 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -339,9 +339,9 @@ public class GlobalConfiguration extends ConfigurationPart { public boolean fixEntityPositionDesync = true; public boolean loadPermissionsYmlBeforePlugins = true; @Constraints.Min(4) diff --git a/patches/server/0028-Delete-Timings.patch b/patches/server/0028-Delete-Timings.patch index a2465be..b73ca1d 100644 --- a/patches/server/0028-Delete-Timings.patch +++ b/patches/server/0028-Delete-Timings.patch @@ -731,7 +731,7 @@ index 24121a43aeb5e9bce013f30c92dddd15f99736c6..791cb04a13597eee4dbd28fabe2835ab String content = context.getRange().get(context.getInput()); String[] args = org.apache.commons.lang3.StringUtils.split(content, ' '); // fix adjacent spaces (from console/plugins) causing empty array elements diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 70ae8cd69935d6bc446bb3e425c7982b6fd1c978..6e2b758b2697baf6082d071cc126fe6cfb01f8da 100644 +index e5eecd15040d4c0a7c8a0de166e5dddb84f35974..9367886f9a313691b7bce16674f609e7b4975659 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -1,6 +1,5 @@ @@ -741,7 +741,7 @@ index 70ae8cd69935d6bc446bb3e425c7982b6fd1c978..6e2b758b2697baf6082d071cc126fe6c import com.mojang.logging.LogUtils; import io.papermc.paper.configuration.constraint.Constraints; import io.papermc.paper.configuration.type.number.DoubleOr; -@@ -99,29 +98,6 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -100,29 +99,6 @@ public class GlobalConfiguration extends ConfigurationPart { public boolean enableImmediately = false; } diff --git a/patches/server/0037-Block-Log4Shell-exploit.patch b/patches/server/0037-Block-Log4Shell-exploit.patch index ded1d24..3b87f3c 100644 --- a/patches/server/0037-Block-Log4Shell-exploit.patch +++ b/patches/server/0037-Block-Log4Shell-exploit.patch @@ -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 2f98a967bdc0dcf93f8e2960a1c783a5d6cbbc7f..4bdcd831f81379a464320851ff8772b9fe00b734 100644 +index 50b4e3fb244b8bac1a6a6d90aaf3b4be075b2500..4e844772b0343633ba44299544e77c012a1de888 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2420,6 +2420,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2424,6 +2424,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } private void tryHandleChat(String s, Runnable runnable, boolean sync) { // CraftBukkit @@ -16,7 +16,7 @@ index 2f98a967bdc0dcf93f8e2960a1c783a5d6cbbc7f..4bdcd831f81379a464320851ff8772b9 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 -@@ -2451,6 +2452,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2455,6 +2456,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } } diff --git a/patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch b/patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch index 296a10b..9358d41 100644 --- a/patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch +++ b/patches/server/0055-Option-to-disable-moved-wrongly-threshold.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable moved wrongly threshold diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4bdcd831f81379a464320851ff8772b9fe00b734..f9dd408ab11f706f3df561e704ba635e672b4dbc 100644 +index 4e844772b0343633ba44299544e77c012a1de888..67b45e363dcc985797b689ce50b8ca3e6a61586c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -585,7 +585,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -28,7 +28,7 @@ index 4bdcd831f81379a464320851ff8772b9fe00b734..f9dd408ab11f706f3df561e704ba635e ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)}); } -@@ -1467,7 +1467,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1471,7 +1471,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY, toX, toY, toZ, toYaw, toPitch, true); if (!event.isAllowed()) { @@ -37,7 +37,7 @@ index 4bdcd831f81379a464320851ff8772b9fe00b734..f9dd408ab11f706f3df561e704ba635e ServerGamePacketListenerImpl.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d6, d7, d8}); this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot()); return; -@@ -1537,7 +1537,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1541,7 +1541,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl d10 = d6 * d6 + d7 * d7 + d8 * d8; boolean movedWrongly = false; // Paper - Add fail move event; rename