From 35d3edcd37b96341ab076f676b128df282f185e8 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Fri, 24 Oct 2025 16:48:23 +0300 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@7525225b fireballs weren't respecting the mob griefing override config, closes #1702, supercedes #1708 PurpurMC/Purpur@a260e4f8 hostile mobs would still spawn on blue/packed ice in certain scenarios - fixes #1701 (#1709) PurpurMC/Purpur@b66c0af9 Shift + right click with mending option gives mass xp when it shouldn't - closes #1694 (#1710) --- .../features/0003-Completely-remove-Mojang-profiler.patch | 8 ++++---- .../features/0041-Implement-Secure-Seed.patch | 6 +++--- .../features/0042-Dynamic-Activation-of-Brain.patch | 8 ++++---- gradle.properties | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch b/divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch index f923132..d4eb80d 100644 --- a/divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch +++ b/divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch @@ -1336,7 +1336,7 @@ index 488fc6088d69148f60a913b42ffb964c48eb0324..94851554c2c3e0f5a2d72606fda166ad } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 7dedba7fa332e02c4655424fea5263fee56222d8..ed585116e2346bf8ef9701f15cc97b64e85acdb2 100644 +index b8b641caf8b82f4071bfeff37d50ef65ff2a0505..d182aafc4c8b4ea657ec3228c45fb29f05ff8d75 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -77,8 +77,6 @@ import net.minecraft.util.RandomSource; @@ -2557,7 +2557,7 @@ index f31a29531cc7d63bed5a4bcbe3986bcc366b6103..6f7812f22399f67923e53a10a21ebd49 } diff --git a/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index c5f7213b91d7a533ff56e4789514b47adb791777..d115155616a0a76a8429c0f5645a8cba73d8bc80 100644 +index 4dbfee2698fbd63c0832440265b6128aee5380d8..c309b01a461ddb47d20a6c96bd693e4850bd731b 100644 --- a/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -14,8 +14,6 @@ import net.minecraft.sounds.SoundEvents; @@ -2582,7 +2582,7 @@ index c5f7213b91d7a533ff56e4789514b47adb791777..d115155616a0a76a8429c0f5645a8cba if (this.isConverting()) { this.timeInOverworld++; diff --git a/net/minecraft/world/entity/monster/piglin/Piglin.java b/net/minecraft/world/entity/monster/piglin/Piglin.java -index dee71746e90f8a81e29ee35c3438219172509d6b..359665cfb2004c49f8e8a19edc7b31c99ce863bf 100644 +index 9a1f1b8ff394e4849301508dd82669246eeba2de..b21ca373220f80c81cadab1eda482057d6366caf 100644 --- a/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -16,8 +16,6 @@ import net.minecraft.tags.ItemTags; @@ -2594,7 +2594,7 @@ index dee71746e90f8a81e29ee35c3438219172509d6b..359665cfb2004c49f8e8a19edc7b31c9 import net.minecraft.world.DifficultyInstance; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -@@ -347,11 +345,8 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento +@@ -352,11 +350,8 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento @Override protected void customServerAiStep(ServerLevel level) { diff --git a/divinemc-server/minecraft-patches/features/0041-Implement-Secure-Seed.patch b/divinemc-server/minecraft-patches/features/0041-Implement-Secure-Seed.patch index 44a65dc..7430be6 100644 --- a/divinemc-server/minecraft-patches/features/0041-Implement-Secure-Seed.patch +++ b/divinemc-server/minecraft-patches/features/0041-Implement-Secure-Seed.patch @@ -64,7 +64,7 @@ index 94851554c2c3e0f5a2d72606fda166adb586bbca..ca0c38974d75e95d258978ff9c8a2749 } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index e6e54f23e302292aa9e9495c00aaae22cf18dd94..97ecdd880c0225d176859517ed715e2b4159ddeb 100644 +index f038c8fe7fa84457dcee2276bbbdb7ec8533d430..646ca37bba6da8ab0babbf4a1e6ba88e75658e72 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -655,6 +655,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -76,10 +76,10 @@ index e6e54f23e302292aa9e9495c00aaae22cf18dd94..97ecdd880c0225d176859517ed715e2b DataFixer fixerUpper = server.getFixerUpper(); // Paper - rewrite chunk system diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java -index 97d15b759d65e32df4d780ec4850b986fcaf6ead..bd9dbf142a303893709ff6d5e9159d12fe892bf1 100644 +index a03b1d15aa8b41e7c22464e8b66811c41acdcef2..00d172e663ae9aa880fa267792899a79f912ea01 100644 --- a/net/minecraft/world/entity/monster/Slime.java +++ b/net/minecraft/world/entity/monster/Slime.java -@@ -408,7 +408,11 @@ public class Slime extends Mob implements Enemy { +@@ -413,7 +413,11 @@ public class Slime extends Mob implements Enemy { } ChunkPos chunkPos = new ChunkPos(pos); diff --git a/divinemc-server/minecraft-patches/features/0042-Dynamic-Activation-of-Brain.patch b/divinemc-server/minecraft-patches/features/0042-Dynamic-Activation-of-Brain.patch index 620ecb9..bd193f2 100644 --- a/divinemc-server/minecraft-patches/features/0042-Dynamic-Activation-of-Brain.patch +++ b/divinemc-server/minecraft-patches/features/0042-Dynamic-Activation-of-Brain.patch @@ -31,7 +31,7 @@ index ca21597263cb430e2a5ae07e8cecfb0d53a270d2..226088405c019922085285ba5d04d7c1 } } diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 97ecdd880c0225d176859517ed715e2b4159ddeb..2aac1cdfa0c3cdf3d56d57452d45318ef6793cbb 100644 +index 646ca37bba6da8ab0babbf4a1e6ba88e75658e72..1d9b32476c1b89984f1afa8e906ca09472b8d6b2 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -830,6 +830,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -302,7 +302,7 @@ index 58ee22461c0330e2fbbbf283c154b8141e2d1953..1ef0fa87f55a4fe6309ed456b0458287 @Override diff --git a/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index d115155616a0a76a8429c0f5645a8cba73d8bc80..e998708d6f0a588710d3fc8dea08bac2470d5557 100644 +index c309b01a461ddb47d20a6c96bd693e4850bd731b..5ccf6e916c5c5ebe034a55b71725f740a21f4f83 100644 --- a/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -87,6 +87,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { @@ -346,7 +346,7 @@ index d115155616a0a76a8429c0f5645a8cba73d8bc80..e998708d6f0a588710d3fc8dea08bac2 @Override diff --git a/net/minecraft/world/entity/monster/piglin/Piglin.java b/net/minecraft/world/entity/monster/piglin/Piglin.java -index 359665cfb2004c49f8e8a19edc7b31c99ce863bf..011d293a3cf7d0d2510619bcd282a51b4b84606c 100644 +index b21ca373220f80c81cadab1eda482057d6366caf..8d0b364149c3772b95e97136f77749f7aadd442a 100644 --- a/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -128,6 +128,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento @@ -357,7 +357,7 @@ index 359665cfb2004c49f8e8a19edc7b31c99ce863bf..011d293a3cf7d0d2510619bcd282a51b public Piglin(EntityType type, Level level) { super(type, level); -@@ -345,10 +346,13 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento +@@ -350,10 +351,13 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento @Override protected void customServerAiStep(ServerLevel level) { diff --git a/gradle.properties b/gradle.properties index 9913368..e67ea8e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.bxteam.divinemc version=1.21.10-R0.1-SNAPSHOT mcVersion=1.21.10 -purpurRef=45bc9f4160f56de9effebb44241a819e198abd8c +purpurRef=b66c0af93b0cdf2366943b330ef3d08c2dbf9807 experimental=true org.gradle.configuration-cache=true