From 6bfdd1e901f70a3d792891ed310838f5854a8ed3 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Thu, 11 Dec 2025 16:56:39 +0300 Subject: [PATCH] update to 1.21.11 release --- divinemc-server/build.gradle.kts.patch | 2 +- .../features/0001-Rebrand.patch | 4 +- ...03-Completely-remove-Mojang-profiler.patch | 48 +++++++++---------- ...22-Option-to-disable-disconnect.spam.patch | 12 ++--- ...weird-movement-and-disable-teleporti.patch | 6 +-- .../features/0035-Lag-compensation.patch | 4 +- .../features/0036-Virtual-Threads.patch | 8 ++-- .../0043-Petal-Multithreaded-Tracker.patch | 4 +- ...-SparklyPaper-Parallel-world-ticking.patch | 10 ++-- .../0049-MSPT-Tracking-for-each-world.patch | 4 +- .../0050-Catch-update-suppressors.patch | 4 +- .../features/0057-Leaves-Protocol-Core.patch | 4 +- .../0059-Linear-region-file-format.patch | 4 +- .../server/MinecraftServer.java.patch | 4 +- ...-SparklyPaper-Optimize-canSee-checks.patch | 4 +- .../0013-Petal-Multithreaded-Tracker.patch | 6 +-- ...02-Add-missing-purpur-config-options.patch | 20 ++++---- ...-Optimize-default-values-for-configs.patch | 6 +-- ...igurable-movement-speed-for-entities.patch | 22 ++++----- gradle.properties | 6 +-- 20 files changed, 91 insertions(+), 91 deletions(-) diff --git a/divinemc-server/build.gradle.kts.patch b/divinemc-server/build.gradle.kts.patch index cdc9a13..8e41946 100644 --- a/divinemc-server/build.gradle.kts.patch +++ b/divinemc-server/build.gradle.kts.patch @@ -7,7 +7,7 @@ +val bxTeamMavenPublicUrl = "https://repo.bxteam.org/snapshots/" dependencies { - mache("io.papermc:mache:1.21.11-rc3+build.1") + mache("io.papermc:mache:1.21.11+build.1") @@ -25,6 +_,7 @@ // Purpur start - Rebrand diff --git a/divinemc-server/minecraft-patches/features/0001-Rebrand.patch b/divinemc-server/minecraft-patches/features/0001-Rebrand.patch index 192bf15..568bedf 100644 --- a/divinemc-server/minecraft-patches/features/0001-Rebrand.patch +++ b/divinemc-server/minecraft-patches/features/0001-Rebrand.patch @@ -120,10 +120,10 @@ index 272e2871aca8d283229cc5618e3051146db56681..e5d78f6a8a2ef2a197b3d327ca48679f String awtException = io.papermc.paper.util.ServerEnvironment.awtDependencyCheck(); if (awtException != null) { diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index e3561303df02b5c769dd039ad45c684062e04bd5..990b50a5ec6d578924cae12031a6ab467f0f1287 100644 +index ec9e4f65543d153b92c4839345800d3139a29d48..826cc9be6d333d01b83f78159a7809d07091c15c 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1279,6 +1279,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.tickCount % autosavePeriod == 0; try { this.isSaving = true; -@@ -1682,10 +1628,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop serverPlayer1.connection.suspendFlushing()); this.server.getScheduler().mainThreadHeartbeat(); // CraftBukkit // Paper start - optimise Folia entity scheduler -@@ -1812,9 +1748,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Purpur - Ridables @@ -458,7 +458,7 @@ index 990b50a5ec6d578924cae12031a6ab467f0f1287..c425b6a1f3cb2fb451671c1d5732f935 try { serverLevel.tick(hasTimeLeft); } catch (Throwable var7) { -@@ -1870,37 +1799,26 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop parseResults = this.server.getCommands().getDispatcher().parse(stringReader, this.player.createCommandSourceStack()); // Paper start - Handle non-recoverable exceptions if (!parseResults.getExceptions().isEmpty() @@ -34,7 +34,7 @@ index bb030b5a2ea38ee2ca3387eb9c92b1911ccad15a..62ac7576b2b1e2e214bcd2d9d35a20d2 && parseResults.getExceptions().values().stream().anyMatch(e -> e instanceof io.papermc.paper.brigadier.TagParseCommandSyntaxException)) { this.disconnect(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); return; -@@ -2679,6 +2680,7 @@ public class ServerGamePacketListenerImpl +@@ -2672,6 +2673,7 @@ public class ServerGamePacketListenerImpl // this.chatSpamThrottler.increment(); if (!this.chatSpamThrottler.isIncrementAndUnderThreshold() // CraftBukkit end @@ -42,7 +42,7 @@ index bb030b5a2ea38ee2ca3387eb9c92b1911ccad15a..62ac7576b2b1e2e214bcd2d9d35a20d2 && !this.server.getPlayerList().isOp(this.player.nameAndId()) && !this.server.isSingleplayerOwner(this.player.nameAndId())) { this.disconnectAsync(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - kick event cause & add proper async disconnect -@@ -3392,7 +3394,7 @@ public class ServerGamePacketListenerImpl +@@ -3385,7 +3387,7 @@ public class ServerGamePacketListenerImpl public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) { // Paper start - auto recipe limit if (!org.bukkit.Bukkit.isPrimaryThread()) { diff --git a/divinemc-server/minecraft-patches/features/0028-Option-to-allow-weird-movement-and-disable-teleporti.patch b/divinemc-server/minecraft-patches/features/0028-Option-to-allow-weird-movement-and-disable-teleporti.patch index 8499918..bdc1d2f 100644 --- a/divinemc-server/minecraft-patches/features/0028-Option-to-allow-weird-movement-and-disable-teleporti.patch +++ b/divinemc-server/minecraft-patches/features/0028-Option-to-allow-weird-movement-and-disable-teleporti.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Option to allow weird movement and disable teleporting diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 62ac7576b2b1e2e214bcd2d9d35a20d2e9e4bd99..358ea5d52a2e1df9b885bd58a7681b4009361263 100644 +index 82931d8e250fdff02cfc5d8d347e32cf831b932c..db486ebd55bdc335961e63c17f144430ad492653 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -628,7 +628,7 @@ public class ServerGamePacketListenerImpl @@ -27,7 +27,7 @@ index 62ac7576b2b1e2e214bcd2d9d35a20d2e9e4bd99..358ea5d52a2e1df9b885bd58a7681b40 flag1 = true; // Paper - diff on change, this should be moved wrongly LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", rootVehicle.getPlainTextName(), this.player.getPlainTextName(), Math.sqrt(d7)); } -@@ -1587,20 +1587,24 @@ public class ServerGamePacketListenerImpl +@@ -1580,20 +1580,24 @@ public class ServerGamePacketListenerImpl if (this.shouldCheckPlayerMovement(isFallFlying)) { float f2 = isFallFlying ? 300.0F : 100.0F; if (d7 - d6 > Math.max(f2, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed))) { @@ -63,7 +63,7 @@ index 62ac7576b2b1e2e214bcd2d9d35a20d2e9e4bd99..358ea5d52a2e1df9b885bd58a7681b40 } } } -@@ -1661,6 +1665,7 @@ public class ServerGamePacketListenerImpl +@@ -1654,6 +1658,7 @@ public class ServerGamePacketListenerImpl d7 = d3 * d3 + d4 * d4 + d5 * d5; boolean movedWrongly = false; // Paper - Add fail move event; rename if (!this.player.isChangingDimension() diff --git a/divinemc-server/minecraft-patches/features/0035-Lag-compensation.patch b/divinemc-server/minecraft-patches/features/0035-Lag-compensation.patch index 7d0fbae..a116f10 100644 --- a/divinemc-server/minecraft-patches/features/0035-Lag-compensation.patch +++ b/divinemc-server/minecraft-patches/features/0035-Lag-compensation.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Lag compensation TODO: recheck GameRules diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index c425b6a1f3cb2fb451671c1d5732f9352dac5bcf..eab57f8cc5b065e19728643f4ca1340d99751f92 100644 +index 4195b8ec98ec5706c6a4641350a18cda0c456d23..ba88395a39dace9638aff195e38fbe4f67948ce9 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -292,6 +292,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop(), new com.google.common.util.concurrent.ThreadFactoryBuilder() diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index eab57f8cc5b065e19728643f4ca1340d99751f92..56b2c8b781ad7d416ceb05f527826186bd39b188 100644 +index ba88395a39dace9638aff195e38fbe4f67948ce9..31f8155dd62a4b6bbf5aa51d3c6e0f57438df5da 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -2729,8 +2729,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop relatives) { diff --git a/divinemc-server/minecraft-patches/features/0048-SparklyPaper-Parallel-world-ticking.patch b/divinemc-server/minecraft-patches/features/0048-SparklyPaper-Parallel-world-ticking.patch index 7af8404..2bfff5d 100644 --- a/divinemc-server/minecraft-patches/features/0048-SparklyPaper-Parallel-world-ticking.patch +++ b/divinemc-server/minecraft-patches/features/0048-SparklyPaper-Parallel-world-ticking.patch @@ -111,7 +111,7 @@ index fc618f97cee829dbd4b0c167c5fe515a58189c37..1e4eeb81fe7ef7356d398bb898278699 List states = new java.util.ArrayList<>(level.capturedBlockStates.values()); level.capturedBlockStates.clear(); diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 190eb522be262d7a237aca69bb732463a1895caf..53e1eb987ada082d241ce6f691c3ef2b22f5e709 100644 +index 2488fc0ae21b8e10895b0ef6397d8e0e5bc843a8..b2d66e2f24e64fce0f260e6c807fc1894f122eea 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop serverPlayer1.connection.suspendFlushing()); this.server.getScheduler().mainThreadHeartbeat(); // CraftBukkit -@@ -1782,28 +1807,43 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop, ServerLevel> oldLevels = this.levels; Map, ServerLevel> newLevels = Maps.newLinkedHashMap(oldLevels); newLevels.remove(level.dimension()); diff --git a/divinemc-server/minecraft-patches/features/0049-MSPT-Tracking-for-each-world.patch b/divinemc-server/minecraft-patches/features/0049-MSPT-Tracking-for-each-world.patch index e9723fd..5c2581a 100644 --- a/divinemc-server/minecraft-patches/features/0049-MSPT-Tracking-for-each-world.patch +++ b/divinemc-server/minecraft-patches/features/0049-MSPT-Tracking-for-each-world.patch @@ -5,10 +5,10 @@ Subject: [PATCH] MSPT Tracking for each world diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 53e1eb987ada082d241ce6f691c3ef2b22f5e709..fd183c0cb9bc9de2a717e9e6845ff76ec84ba438 100644 +index b2d66e2f24e64fce0f260e6c807fc1894f122eea..9c52a588af51fd7c0bcbc5267602baba8a53b2d3 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1752,7 +1752,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player private static final WeakHashMap> pluginWeakReferences = new WeakHashMap<>(); private int hash = 0; -@@ -2142,9 +2142,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -2141,9 +2141,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 d53b5f5..dbce298 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 770939f9abf4640dff5fc6af113926913359186a..c8d6b0dfe5674512b0d55e065b274b6df3f11c95 100644 +index 21ecf7a0c607eebdd28aa26474a363beb7b57b72..1a111cabac9995aa481baaf2fe7bfbf02a296b96 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2717,7 +2717,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -2716,7 +2716,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa Iterator iterator = collection.iterator(); while (iterator.hasNext()) { AttributeInstance genericInstance = iterator.next(); @@ -45,7 +45,7 @@ index 770939f9abf4640dff5fc6af113926913359186a..c8d6b0dfe5674512b0d55e065b274b6d break; } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 5bb856e86f2270c75406b8a5540f4a9c1e679fb4..da3a92e0f857a57c954b638b8e3bf7e65a7bd58e 100644 +index d37d7ae608c80913afdde48c3e03d11e4697d1d1..25aff851e4723500d0f8d05c0d231103ee5dff7b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1930,6 +1930,26 @@ public class CraftEventFactory { diff --git a/divinemc-server/purpur-patches/features/0002-Add-missing-purpur-config-options.patch b/divinemc-server/purpur-patches/features/0002-Add-missing-purpur-config-options.patch index 89f94fc..6e95b0c 100644 --- a/divinemc-server/purpur-patches/features/0002-Add-missing-purpur-config-options.patch +++ b/divinemc-server/purpur-patches/features/0002-Add-missing-purpur-config-options.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing purpur config options diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 96189eedfe63e457cdeca64b91670222fa0df31b..98a62c5b9448ef788e5ccf24d343175e44142c8e 100644 +index fddc1cf85d12fe36ed284be80f3f745535e06786..c6abcc520f11538532cf22a550e8741056f68e6a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -333,6 +333,7 @@ public class PurpurConfig { @@ -25,10 +25,10 @@ index 96189eedfe63e457cdeca64b91670222fa0df31b..98a62c5b9448ef788e5ccf24d343175e org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27); enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 24a6733d8e9825d18aaacc46054929418744aa19..68e84c12fc25c425696aa1687f70660c19961f21 100644 +index 0ee5516fe325d8e2aa08592e1ae757b0bfb98bfe..9236c5b6c11885f0cea49fa7c4a35c4dbcad3b24 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1272,12 +1272,20 @@ public class PurpurWorldConfig { +@@ -1274,12 +1274,20 @@ public class PurpurWorldConfig { public boolean allayControllable = true; public double allayMaxHealth = 20.0D; public double allayScale = 1.0D; @@ -49,7 +49,7 @@ index 24a6733d8e9825d18aaacc46054929418744aa19..68e84c12fc25c425696aa1687f70660c } public boolean armadilloRidable = false; -@@ -1428,6 +1436,10 @@ public class PurpurWorldConfig { +@@ -1434,6 +1442,10 @@ public class PurpurWorldConfig { public double camelMovementSpeedMin = 0.09D; public double camelMovementSpeedMax = 0.09D; public int camelBreedingTicks = 6000; @@ -60,7 +60,7 @@ index 24a6733d8e9825d18aaacc46054929418744aa19..68e84c12fc25c425696aa1687f70660c private void camelSettings() { camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater); camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin); -@@ -1437,6 +1449,10 @@ public class PurpurWorldConfig { +@@ -1443,6 +1455,10 @@ public class PurpurWorldConfig { camelMovementSpeedMin = getDouble("mobs.camel.attributes.movement_speed.min", camelMovementSpeedMin); camelMovementSpeedMax = getDouble("mobs.camel.attributes.movement_speed.max", camelMovementSpeedMax); camelBreedingTicks = getInt("mobs.camel.breeding-delay-ticks", camelBreedingTicks); @@ -71,7 +71,7 @@ index 24a6733d8e9825d18aaacc46054929418744aa19..68e84c12fc25c425696aa1687f70660c } public boolean catRidable = false; -@@ -1945,12 +1961,22 @@ public class PurpurWorldConfig { +@@ -1951,12 +1967,22 @@ public class PurpurWorldConfig { public boolean frogControllable = true; public float frogRidableJumpHeight = 0.65F; public int frogBreedingTicks = 6000; @@ -94,7 +94,7 @@ index 24a6733d8e9825d18aaacc46054929418744aa19..68e84c12fc25c425696aa1687f70660c } public boolean ghastRidable = false; -@@ -3057,6 +3083,10 @@ public class PurpurWorldConfig { +@@ -3059,6 +3085,10 @@ public class PurpurWorldConfig { public double snifferMaxHealth = 14.0D; public double snifferScale = 1.0D; public int snifferBreedingTicks = 6000; @@ -105,7 +105,7 @@ index 24a6733d8e9825d18aaacc46054929418744aa19..68e84c12fc25c425696aa1687f70660c private void snifferSettings() { snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable); snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater); -@@ -3064,6 +3094,10 @@ public class PurpurWorldConfig { +@@ -3066,6 +3096,10 @@ public class PurpurWorldConfig { snifferMaxHealth = getDouble("mobs.sniffer.attributes.max_health", snifferMaxHealth); snifferScale = Mth.clamp(getDouble("mobs.sniffer.attributes.scale", snifferScale), 0.0625D, 16.0D); snifferBreedingTicks = getInt("mobs.sniffer.breeding-delay-ticks", snifferBreedingTicks); @@ -116,7 +116,7 @@ index 24a6733d8e9825d18aaacc46054929418744aa19..68e84c12fc25c425696aa1687f70660c } public boolean squidRidable = false; -@@ -3165,10 +3199,20 @@ public class PurpurWorldConfig { +@@ -3167,10 +3201,20 @@ public class PurpurWorldConfig { public boolean tadpoleRidable = false; public boolean tadpoleRidableInWater = true; public boolean tadpoleControllable = true; @@ -137,7 +137,7 @@ index 24a6733d8e9825d18aaacc46054929418744aa19..68e84c12fc25c425696aa1687f70660c } public boolean traderLlamaRidable = false; -@@ -3403,11 +3447,21 @@ public class PurpurWorldConfig { +@@ -3405,11 +3449,21 @@ public class PurpurWorldConfig { public boolean wardenRidableInWater = true; public boolean wardenControllable = true; public boolean wardenCanUseSonicBoom = true; diff --git a/divinemc-server/purpur-patches/features/0003-Optimize-default-values-for-configs.patch b/divinemc-server/purpur-patches/features/0003-Optimize-default-values-for-configs.patch index 9d18ea9..de368eb 100644 --- a/divinemc-server/purpur-patches/features/0003-Optimize-default-values-for-configs.patch +++ b/divinemc-server/purpur-patches/features/0003-Optimize-default-values-for-configs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize default values for configs diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 98a62c5b9448ef788e5ccf24d343175e44142c8e..e596e1ed1b65ea3589b13d0684e7f136316b5770 100644 +index c6abcc520f11538532cf22a550e8741056f68e6a..2257a8ac0b31f4c353fa50d9a4f43b1e8014cbc7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -246,7 +246,7 @@ public class PurpurConfig { @@ -18,10 +18,10 @@ index 98a62c5b9448ef788e5ccf24d343175e44142c8e..e596e1ed1b65ea3589b13d0684e7f136 useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 68e84c12fc25c425696aa1687f70660c19961f21..dbc8fd59f97ccd13e805128b7aee23486c840ad8 100644 +index 9236c5b6c11885f0cea49fa7c4a35c4dbcad3b24..975608ac58b800ba01c613dfcf78e4be3b8ef3ef 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -3340,8 +3340,8 @@ public class PurpurWorldConfig { +@@ -3342,8 +3342,8 @@ public class PurpurWorldConfig { public boolean villagerDisplayTradeItem = true; public int villagerSpawnIronGolemRadius = 0; public int villagerSpawnIronGolemLimit = 0; diff --git a/divinemc-server/purpur-patches/features/0004-Configurable-movement-speed-for-entities.patch b/divinemc-server/purpur-patches/features/0004-Configurable-movement-speed-for-entities.patch index 8a5fc0d..55d9f42 100644 --- a/divinemc-server/purpur-patches/features/0004-Configurable-movement-speed-for-entities.patch +++ b/divinemc-server/purpur-patches/features/0004-Configurable-movement-speed-for-entities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable movement speed for entities diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index dbc8fd59f97ccd13e805128b7aee23486c840ad8..16a88be168ad71a5a8a96960dfbb54119f586132 100644 +index 975608ac58b800ba01c613dfcf78e4be3b8ef3ef..57bbcf0ef659e4f0954b994d40468b3fc40aba0c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1747,6 +1747,7 @@ public class PurpurWorldConfig { +@@ -1753,6 +1753,7 @@ public class PurpurWorldConfig { public boolean drownedTakeDamageFromWater = false; public boolean drownedBreakDoors = false; public boolean drownedAlwaysDropExp = false; @@ -16,7 +16,7 @@ index dbc8fd59f97ccd13e805128b7aee23486c840ad8..16a88be168ad71a5a8a96960dfbb5411 private void drownedSettings() { drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable); drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater); -@@ -1765,6 +1766,7 @@ public class PurpurWorldConfig { +@@ -1771,6 +1772,7 @@ public class PurpurWorldConfig { drownedTakeDamageFromWater = getBoolean("mobs.drowned.takes-damage-from-water", drownedTakeDamageFromWater); drownedBreakDoors = getBoolean("mobs.drowned.can-break-doors", drownedBreakDoors); drownedAlwaysDropExp = getBoolean("mobs.drowned.always-drop-exp", drownedAlwaysDropExp); @@ -24,7 +24,7 @@ index dbc8fd59f97ccd13e805128b7aee23486c840ad8..16a88be168ad71a5a8a96960dfbb5411 } public boolean elderGuardianRidable = false; -@@ -2192,6 +2194,7 @@ public class PurpurWorldConfig { +@@ -2198,6 +2200,7 @@ public class PurpurWorldConfig { public boolean huskJockeyTryExistingChickens = true; public boolean huskTakeDamageFromWater = false; public boolean huskAlwaysDropExp = false; @@ -32,7 +32,7 @@ index dbc8fd59f97ccd13e805128b7aee23486c840ad8..16a88be168ad71a5a8a96960dfbb5411 private void huskSettings() { huskRidable = getBoolean("mobs.husk.ridable", huskRidable); huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater); -@@ -2209,6 +2212,7 @@ public class PurpurWorldConfig { +@@ -2215,6 +2218,7 @@ public class PurpurWorldConfig { huskJockeyTryExistingChickens = getBoolean("mobs.husk.jockey.try-existing-chickens", huskJockeyTryExistingChickens); huskTakeDamageFromWater = getBoolean("mobs.husk.takes-damage-from-water", huskTakeDamageFromWater); huskAlwaysDropExp = getBoolean("mobs.husk.always-drop-exp", huskAlwaysDropExp); @@ -40,7 +40,7 @@ index dbc8fd59f97ccd13e805128b7aee23486c840ad8..16a88be168ad71a5a8a96960dfbb5411 } public boolean illusionerRidable = false; -@@ -3623,6 +3627,7 @@ public class PurpurWorldConfig { +@@ -3625,6 +3629,7 @@ public class PurpurWorldConfig { public boolean zombieTakeDamageFromWater = false; public boolean zombieAlwaysDropExp = false; public double zombieHeadVisibilityPercent = 0.5D; @@ -48,7 +48,7 @@ index dbc8fd59f97ccd13e805128b7aee23486c840ad8..16a88be168ad71a5a8a96960dfbb5411 private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -3648,6 +3653,7 @@ public class PurpurWorldConfig { +@@ -3650,6 +3655,7 @@ public class PurpurWorldConfig { zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater); zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp); zombieHeadVisibilityPercent = getDouble("mobs.zombie.head-visibility-percent", zombieHeadVisibilityPercent); @@ -56,7 +56,7 @@ index dbc8fd59f97ccd13e805128b7aee23486c840ad8..16a88be168ad71a5a8a96960dfbb5411 } public boolean zombieHorseRidable = false; -@@ -3697,6 +3703,7 @@ public class PurpurWorldConfig { +@@ -3714,6 +3720,7 @@ public class PurpurWorldConfig { public int zombieVillagerCuringTimeMax = 6000; public boolean zombieVillagerCureEnabled = true; public boolean zombieVillagerAlwaysDropExp = false; @@ -64,7 +64,7 @@ index dbc8fd59f97ccd13e805128b7aee23486c840ad8..16a88be168ad71a5a8a96960dfbb5411 private void zombieVillagerSettings() { zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); -@@ -3717,6 +3724,7 @@ public class PurpurWorldConfig { +@@ -3734,6 +3741,7 @@ public class PurpurWorldConfig { zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax); zombieVillagerCureEnabled = getBoolean("mobs.zombie_villager.cure.enabled", zombieVillagerCureEnabled); zombieVillagerAlwaysDropExp = getBoolean("mobs.zombie_villager.always-drop-exp", zombieVillagerAlwaysDropExp); @@ -72,7 +72,7 @@ index dbc8fd59f97ccd13e805128b7aee23486c840ad8..16a88be168ad71a5a8a96960dfbb5411 } public boolean zombifiedPiglinRidable = false; -@@ -3731,6 +3739,7 @@ public class PurpurWorldConfig { +@@ -3748,6 +3756,7 @@ public class PurpurWorldConfig { public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = false; public boolean zombifiedPiglinTakeDamageFromWater = false; public boolean zombifiedPiglinAlwaysDropExp = false; @@ -80,7 +80,7 @@ index dbc8fd59f97ccd13e805128b7aee23486c840ad8..16a88be168ad71a5a8a96960dfbb5411 private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -3752,6 +3761,7 @@ public class PurpurWorldConfig { +@@ -3769,6 +3778,7 @@ public class PurpurWorldConfig { zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry); zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater); zombifiedPiglinAlwaysDropExp = getBoolean("mobs.zombified_piglin.always-drop-exp", zombifiedPiglinAlwaysDropExp); diff --git a/gradle.properties b/gradle.properties index 0631441..41c1caf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ group = org.bxteam.divinemc -version=1.21.11-rc3-R0.1-SNAPSHOT +version=1.21.11-R0.1-SNAPSHOT -mcVersion=1.21.11-rc3 +mcVersion=1.21.11 apiVersion=1.21.11 -purpurRef=4db5f6cb4e8562a69e9f41d882cd111220a0f6e2 +purpurRef=068b0d5a9e8b9946c2a5d98a51b03df7b08a41f4 experimental=true org.gradle.configuration-cache=true