From 6491bbe2550edd698f0447111418366b33ea5b8c Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Sun, 14 Dec 2025 16:12:29 +0300 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@fe2ec0b3 Updated Upstream (Paper) --- .../features/0010-SparklyPaper-Optimize-canSee-checks.patch | 4 ++-- .../features/0013-Petal-Multithreaded-Tracker.patch | 4 ++-- gradle.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/divinemc-server/paper-patches/features/0010-SparklyPaper-Optimize-canSee-checks.patch b/divinemc-server/paper-patches/features/0010-SparklyPaper-Optimize-canSee-checks.patch index 95ebc38..192e676 100644 --- a/divinemc-server/paper-patches/features/0010-SparklyPaper-Optimize-canSee-checks.patch +++ b/divinemc-server/paper-patches/features/0010-SparklyPaper-Optimize-canSee-checks.patch @@ -14,7 +14,7 @@ This seems stupid, but it does seem that it improves the performance a bit, and We also create a "canSee" method tailored for "ChunkMap#updatePlayer()", a method without the equals check (the "updatePlayer()" already checks if the entity is the same entity) because the CraftPlayer's `equals()` check is a *bit* expensive compared to only checking the object's identity, and because the identity has already been check, we don't need to check it twice. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 38a03942a3e6473b8e8a56cf2125a857dd3e9193..21ecf7a0c607eebdd28aa26474a363beb7b57b72 100644 +index 365894ad23c0fe47fc643ca1a7478b242210ea43..722717120a9a2da55386154b636632ee13b9b0e9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -236,7 +236,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa @@ -26,7 +26,7 @@ index 38a03942a3e6473b8e8a56cf2125a857dd3e9193..21ecf7a0c607eebdd28aa26474a363be private final Set unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player private static final WeakHashMap> pluginWeakReferences = new WeakHashMap<>(); private int hash = 0; -@@ -2141,9 +2141,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -2142,9 +2142,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa @Override public boolean canSee(org.bukkit.entity.Entity entity) { diff --git a/divinemc-server/paper-patches/features/0013-Petal-Multithreaded-Tracker.patch b/divinemc-server/paper-patches/features/0013-Petal-Multithreaded-Tracker.patch index dbce298..c60a939 100644 --- a/divinemc-server/paper-patches/features/0013-Petal-Multithreaded-Tracker.patch +++ b/divinemc-server/paper-patches/features/0013-Petal-Multithreaded-Tracker.patch @@ -32,10 +32,10 @@ index d7398b1ecf2660c29fb7d106b48fe02d3736603e..ab499a7eaccdc1578ec64f90f54f79b0 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 21ecf7a0c607eebdd28aa26474a363beb7b57b72..1a111cabac9995aa481baaf2fe7bfbf02a296b96 100644 +index 722717120a9a2da55386154b636632ee13b9b0e9..268586de0cca16bfffad641c1255e6f3b9cabf0c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2716,7 +2716,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -2725,7 +2725,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa Iterator iterator = collection.iterator(); while (iterator.hasNext()) { AttributeInstance genericInstance = iterator.next(); diff --git a/gradle.properties b/gradle.properties index 41c1caf..62f6764 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ version=1.21.11-R0.1-SNAPSHOT mcVersion=1.21.11 apiVersion=1.21.11 -purpurRef=068b0d5a9e8b9946c2a5d98a51b03df7b08a41f4 +purpurRef=fe2ec0b3261f87c744f431699822bb878ca8922b experimental=true org.gradle.configuration-cache=true