From 939c2389d595f961c3879c8893e596987ce95c44 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Thu, 17 Jul 2025 18:24:36 +0300 Subject: [PATCH] move small patches back to sources --- .../features/0001-Rebrand.patch | 4 +- .../features/0002-Configuration.patch | 4 +- ...03-Completely-remove-Mojang-profiler.patch | 76 +++++++++---------- ...til.patch => 0010-lithium-fast_util.patch} | 0 ...> 0011-C2ME-Optimize-world-gen-math.patch} | 0 ...7075.patch => 0012-Re-Fix-MC-117075.patch} | 0 ...ast_hand_swing-entity.fast_elytra_ch.patch | 32 -------- ...per-Clear-dirty-stats-after-copying.patch} | 0 ....patch => 0014-Async-locate-command.patch} | 0 .../0014-C2ME-Reduce-Allocations.patch | 24 ------ ...Carpet-Fixes-RecipeManager-Optimize.patch} | 0 ...-lithium-faster-chunk-serialization.patch} | 0 ...0017-C2ME-optimize-noise-generation.patch} | 0 .../features/0017-Fix-MC-119417.patch | 19 ----- .../features/0018-Fix-MC-7569.patch | 20 ----- ...=> 0018-Optimize-block-state-lookup.patch} | 2 +- ...n-t-respond-ping-before-start-fully.patch} | 0 .../features/0019-Fix-MC-110386.patch | 19 ----- ...rs-that-were-dead-on-server-restart.patch} | 2 +- ...67.patch => 0021-Configurable-MC-67.patch} | 0 .../features/0021-Fix-MC-31819.patch | 23 ------ ...patch => 0022-Configurable-MC-59471.patch} | 0 .../features/0022-Fix-MC-172801.patch | 26 ------- ...h => 0023-Use-Java-s-Math-functions.patch} | 0 ...ay.patch => 0024-Disable-leaf-decay.patch} | 0 ...-Fixes-Fix-Slime-Block-Bounce-Logic.patch} | 0 ...patch => 0026-Optimize-entity-brain.patch} | 0 ...-distanceToSqr-call-in-ServerEntity.patch} | 0 ...pet-Fixes-Optimized-getBiome-method.patch} | 0 ...w-throttling-hopper-checks-if-the-t.patch} | 0 ...030-Carpet-Fixes-Sheep-Optimization.patch} | 0 ...S-Addition-Optimized-dragon-respawn.patch} | 0 ... 0032-ModernFix-compact_bit_storage.patch} | 2 +- .../features/0033-Fix-sprint-glitch.patch | 19 ----- ...3-Option-to-disable-disconnect.spam.patch} | 0 ...ble-saving-of-snowball-and-firework.patch} | 0 ... => 0035-Snowball-and-Egg-knockback.patch} | 0 ....patch => 0036-Optimize-suffocation.patch} | 2 +- ...> 0037-Reduce-chunk-loading-lookups.patch} | 0 ...gurable-movement-speed-for-entities.patch} | 0 ...t-dirty-flag-when-loading-maps-from.patch} | 0 ...BlockEntity-ticking-isRemoved-check.patch} | 0 ...eird-movement-and-disable-teleporti.patch} | 2 +- ...-Raids.patch => 0042-Optimize-Raids.patch} | 0 ...SparklyPaper-Optimize-canSee-checks.patch} | 0 ...Small-optimization-to-LinearPalette.patch} | 0 ...=> 0045-Use-switch-for-VarInt-write.patch} | 0 ...luids.patch => 0046-Optimize-Fluids.patch} | 0 ... 0047-Optimize-Structure-Generation.patch} | 0 ...tch => 0048-Implement-NoChatReports.patch} | 4 +- ...tion.patch => 0049-Lag-compensation.patch} | 8 +- ...reads.patch => 0050-Virtual-Threads.patch} | 6 +- ...g.patch => 0051-Async-Chunk-Sending.patch} | 0 ...Command-block-parse-results-caching.patch} | 0 ...> 0053-Player-ProfileResult-caching.patch} | 0 ...patch => 0054-Implement-Secure-Seed.patch} | 0 ...=> 0055-Dynamic-Activation-of-Brain.patch} | 4 +- ...tch => 0056-Petal-Async-Pathfinding.patch} | 0 ...=> 0057-Petal-Multithreaded-Tracker.patch} | 4 +- ...58-Pufferfish-Optimize-mob-spawning.patch} | 2 +- ...r-ShapelessRecipes-comparison-for-V.patch} | 0 ...0060-C2ME-Density-Function-Compiler.patch} | 0 ...patch => 0061-Clump-experience-orbs.patch} | 0 ...SparklyPaper-Parallel-world-ticking.patch} | 14 ++-- ...> 0063-MSPT-Tracking-for-each-world.patch} | 4 +- ...ch => 0064-Catch-update-suppressors.patch} | 4 +- ...ch => 0065-Regionized-Chunk-Ticking.patch} | 0 ....patch => 0066-C2ME-Limit-NBT-cache.patch} | 0 ...2ME-Optimize-Aquifer-and-Beardifier.patch} | 0 ...patch => 0068-Copper-Bulb-1gt-delay.patch} | 0 ...lay.patch => 0069-Crafter-1gt-delay.patch} | 0 ...tch => 0070-Raytrace-Entity-Tracker.patch} | 0 ...ead.patch => 0071-Async-Join-Thread.patch} | 0 ....patch => 0072-Leaves-Protocol-Core.patch} | 4 +- ...=> 0073-Leaves-Xaero-s-Map-Protocol.patch} | 2 +- ... => 0074-Leaves-Syncmatica-Protocol.patch} | 2 +- ...R-Optimise-non-flush-packet-sending.patch} | 0 ...h => 0076-Linear-region-file-format.patch} | 0 ...> 0077-Cleanup-dead-code-from-Paper.patch} | 0 ...-Disable-offline-warn-if-using-proxy.patch | 19 ----- .../ChunkTickConstants.java.patch} | 10 +-- .../advancements/Advancement.java.patch} | 10 +-- .../net/minecraft/core/BlockPos.java.patch} | 13 +--- .../server/MinecraftServer.java.patch} | 10 +-- .../server/PlayerAdvancements.java.patch} | 10 +-- .../dedicated/DedicatedServer.java.patch} | 23 +++--- .../server/level/ServerPlayer.java.patch | 10 +++ .../server/rcon/RconConsoleSource.java.patch | 11 +++ .../minecraft/world/entity/Entity.java.patch} | 19 +---- .../world/entity/LivingEntity.java.patch | 42 ++++++++++ .../goal/target/HurtByTargetGoal.java.patch | 10 +++ .../ai/sensing/SecondaryPoiSensor.java.patch} | 19 +---- .../entity/monster/ZombieVillager.java.patch} | 11 +-- .../world/entity/player/Player.java.patch | 14 ++++ .../level/LocalMobCapCalculator.java.patch} | 15 +--- .../level/levelgen/SurfaceRules.java.patch} | 11 +-- .../levelgen/feature/OreFeature.java.patch | 11 +++ .../features/0003-Delete-timings.patch | 6 +- ...reads.patch => 0012-Virtual-Threads.patch} | 0 ...patch => 0013-Implement-Secure-Seed.patch} | 0 ...=> 0014-Petal-Multithreaded-Tracker.patch} | 2 +- ...ver-getWorlds-ArrayList-with-a-fastu.patch | 21 ----- ...15-Pufferfish-Optimize-mob-spawning.patch} | 0 ...r-ShapelessRecipes-comparison-for-V.patch} | 0 ...SparklyPaper-Parallel-world-ticking.patch} | 0 ...patch => 0018-Rewrite-ReferenceList.patch} | 0 ....patch => 0019-Leaves-Protocol-Core.patch} | 0 .../common/util/MoonriseConstants.java.patch} | 10 +-- .../manager/PaperEventManager.java.patch} | 15 +--- .../bukkit/craftbukkit/CraftServer.java.patch | 11 +++ .../command/CraftCommandMap.java.patch} | 10 +-- 111 files changed, 217 insertions(+), 460 deletions(-) rename divinemc-server/minecraft-patches/features/{0011-lithium-fast_util.patch => 0010-lithium-fast_util.patch} (100%) rename divinemc-server/minecraft-patches/features/{0015-C2ME-Optimize-world-gen-math.patch => 0011-C2ME-Optimize-world-gen-math.patch} (100%) rename divinemc-server/minecraft-patches/features/{0016-Re-Fix-MC-117075.patch => 0012-Re-Fix-MC-117075.patch} (100%) delete mode 100644 divinemc-server/minecraft-patches/features/0012-lithium-entity.fast_hand_swing-entity.fast_elytra_ch.patch rename divinemc-server/minecraft-patches/features/{0024-SparklyPaper-Clear-dirty-stats-after-copying.patch => 0013-SparklyPaper-Clear-dirty-stats-after-copying.patch} (100%) rename divinemc-server/minecraft-patches/features/{0025-Async-locate-command.patch => 0014-Async-locate-command.patch} (100%) delete mode 100644 divinemc-server/minecraft-patches/features/0014-C2ME-Reduce-Allocations.patch rename divinemc-server/minecraft-patches/features/{0026-Carpet-Fixes-RecipeManager-Optimize.patch => 0015-Carpet-Fixes-RecipeManager-Optimize.patch} (100%) rename divinemc-server/minecraft-patches/features/{0027-lithium-faster-chunk-serialization.patch => 0016-lithium-faster-chunk-serialization.patch} (100%) rename divinemc-server/minecraft-patches/features/{0031-C2ME-optimize-noise-generation.patch => 0017-C2ME-optimize-noise-generation.patch} (100%) delete mode 100644 divinemc-server/minecraft-patches/features/0017-Fix-MC-119417.patch delete mode 100644 divinemc-server/minecraft-patches/features/0018-Fix-MC-7569.patch rename divinemc-server/minecraft-patches/features/{0034-Optimize-block-state-lookup.patch => 0018-Optimize-block-state-lookup.patch} (93%) rename divinemc-server/minecraft-patches/features/{0035-Don-t-respond-ping-before-start-fully.patch => 0019-Don-t-respond-ping-before-start-fully.patch} (100%) delete mode 100644 divinemc-server/minecraft-patches/features/0019-Fix-MC-110386.patch rename divinemc-server/minecraft-patches/features/{0036-Respawn-players-that-were-dead-on-server-restart.patch => 0020-Respawn-players-that-were-dead-on-server-restart.patch} (94%) rename divinemc-server/minecraft-patches/features/{0037-Configurable-MC-67.patch => 0021-Configurable-MC-67.patch} (100%) delete mode 100644 divinemc-server/minecraft-patches/features/0021-Fix-MC-31819.patch rename divinemc-server/minecraft-patches/features/{0038-Configurable-MC-59471.patch => 0022-Configurable-MC-59471.patch} (100%) delete mode 100644 divinemc-server/minecraft-patches/features/0022-Fix-MC-172801.patch rename divinemc-server/minecraft-patches/features/{0039-Use-Java-s-Math-functions.patch => 0023-Use-Java-s-Math-functions.patch} (100%) rename divinemc-server/minecraft-patches/features/{0040-Disable-leaf-decay.patch => 0024-Disable-leaf-decay.patch} (100%) rename divinemc-server/minecraft-patches/features/{0041-Carpet-Fixes-Fix-Slime-Block-Bounce-Logic.patch => 0025-Carpet-Fixes-Fix-Slime-Block-Bounce-Logic.patch} (100%) rename divinemc-server/minecraft-patches/features/{0042-Optimize-entity-brain.patch => 0026-Optimize-entity-brain.patch} (100%) rename divinemc-server/minecraft-patches/features/{0043-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0027-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename divinemc-server/minecraft-patches/features/{0044-Carpet-Fixes-Optimized-getBiome-method.patch => 0028-Carpet-Fixes-Optimized-getBiome-method.patch} (100%) rename divinemc-server/minecraft-patches/features/{0045-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch => 0029-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch} (100%) rename divinemc-server/minecraft-patches/features/{0046-Carpet-Fixes-Sheep-Optimization.patch => 0030-Carpet-Fixes-Sheep-Optimization.patch} (100%) rename divinemc-server/minecraft-patches/features/{0047-Carpet-AMS-Addition-Optimized-dragon-respawn.patch => 0031-Carpet-AMS-Addition-Optimized-dragon-respawn.patch} (100%) rename divinemc-server/minecraft-patches/features/{0048-ModernFix-compact_bit_storage.patch => 0032-ModernFix-compact_bit_storage.patch} (95%) delete mode 100644 divinemc-server/minecraft-patches/features/0033-Fix-sprint-glitch.patch rename divinemc-server/minecraft-patches/features/{0049-Option-to-disable-disconnect.spam.patch => 0033-Option-to-disable-disconnect.spam.patch} (100%) rename divinemc-server/minecraft-patches/features/{0050-Option-to-disable-saving-of-snowball-and-firework.patch => 0034-Option-to-disable-saving-of-snowball-and-firework.patch} (100%) rename divinemc-server/minecraft-patches/features/{0051-Snowball-and-Egg-knockback.patch => 0035-Snowball-and-Egg-knockback.patch} (100%) rename divinemc-server/minecraft-patches/features/{0052-Optimize-suffocation.patch => 0036-Optimize-suffocation.patch} (95%) rename divinemc-server/minecraft-patches/features/{0053-Reduce-chunk-loading-lookups.patch => 0037-Reduce-chunk-loading-lookups.patch} (100%) rename divinemc-server/minecraft-patches/features/{0054-Configurable-movement-speed-for-entities.patch => 0038-Configurable-movement-speed-for-entities.patch} (100%) rename divinemc-server/minecraft-patches/features/{0055-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch => 0039-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch} (100%) rename divinemc-server/minecraft-patches/features/{0056-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch => 0040-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch} (100%) rename divinemc-server/minecraft-patches/features/{0057-Option-to-allow-weird-movement-and-disable-teleporti.patch => 0041-Option-to-allow-weird-movement-and-disable-teleporti.patch} (98%) rename divinemc-server/minecraft-patches/features/{0058-Optimize-Raids.patch => 0042-Optimize-Raids.patch} (100%) rename divinemc-server/minecraft-patches/features/{0059-SparklyPaper-Optimize-canSee-checks.patch => 0043-SparklyPaper-Optimize-canSee-checks.patch} (100%) rename divinemc-server/minecraft-patches/features/{0060-Small-optimization-to-LinearPalette.patch => 0044-Small-optimization-to-LinearPalette.patch} (100%) rename divinemc-server/minecraft-patches/features/{0061-Use-switch-for-VarInt-write.patch => 0045-Use-switch-for-VarInt-write.patch} (100%) rename divinemc-server/minecraft-patches/features/{0062-Optimize-Fluids.patch => 0046-Optimize-Fluids.patch} (100%) rename divinemc-server/minecraft-patches/features/{0063-Optimize-Structure-Generation.patch => 0047-Optimize-Structure-Generation.patch} (100%) rename divinemc-server/minecraft-patches/features/{0064-Implement-NoChatReports.patch => 0048-Implement-NoChatReports.patch} (98%) rename divinemc-server/minecraft-patches/features/{0065-Lag-compensation.patch => 0049-Lag-compensation.patch} (98%) rename divinemc-server/minecraft-patches/features/{0066-Virtual-Threads.patch => 0050-Virtual-Threads.patch} (96%) rename divinemc-server/minecraft-patches/features/{0067-Async-Chunk-Sending.patch => 0051-Async-Chunk-Sending.patch} (100%) rename divinemc-server/minecraft-patches/features/{0068-Command-block-parse-results-caching.patch => 0052-Command-block-parse-results-caching.patch} (100%) rename divinemc-server/minecraft-patches/features/{0069-Player-ProfileResult-caching.patch => 0053-Player-ProfileResult-caching.patch} (100%) rename divinemc-server/minecraft-patches/features/{0070-Implement-Secure-Seed.patch => 0054-Implement-Secure-Seed.patch} (100%) rename divinemc-server/minecraft-patches/features/{0071-Dynamic-Activation-of-Brain.patch => 0055-Dynamic-Activation-of-Brain.patch} (99%) rename divinemc-server/minecraft-patches/features/{0072-Petal-Async-Pathfinding.patch => 0056-Petal-Async-Pathfinding.patch} (100%) rename divinemc-server/minecraft-patches/features/{0073-Petal-Multithreaded-Tracker.patch => 0057-Petal-Multithreaded-Tracker.patch} (99%) rename divinemc-server/minecraft-patches/features/{0074-Pufferfish-Optimize-mob-spawning.patch => 0058-Pufferfish-Optimize-mob-spawning.patch} (99%) rename divinemc-server/minecraft-patches/features/{0075-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch => 0059-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch} (100%) rename divinemc-server/minecraft-patches/features/{0076-C2ME-Density-Function-Compiler.patch => 0060-C2ME-Density-Function-Compiler.patch} (100%) rename divinemc-server/minecraft-patches/features/{0077-Clump-experience-orbs.patch => 0061-Clump-experience-orbs.patch} (100%) rename divinemc-server/minecraft-patches/features/{0078-SparklyPaper-Parallel-world-ticking.patch => 0062-SparklyPaper-Parallel-world-ticking.patch} (99%) rename divinemc-server/minecraft-patches/features/{0079-MSPT-Tracking-for-each-world.patch => 0063-MSPT-Tracking-for-each-world.patch} (93%) rename divinemc-server/minecraft-patches/features/{0080-Catch-update-suppressors.patch => 0064-Catch-update-suppressors.patch} (96%) rename divinemc-server/minecraft-patches/features/{0081-Regionized-Chunk-Ticking.patch => 0065-Regionized-Chunk-Ticking.patch} (100%) rename divinemc-server/minecraft-patches/features/{0083-C2ME-Limit-NBT-cache.patch => 0066-C2ME-Limit-NBT-cache.patch} (100%) rename divinemc-server/minecraft-patches/features/{0085-C2ME-Optimize-Aquifer-and-Beardifier.patch => 0067-C2ME-Optimize-Aquifer-and-Beardifier.patch} (100%) rename divinemc-server/minecraft-patches/features/{0087-Copper-Bulb-1gt-delay.patch => 0068-Copper-Bulb-1gt-delay.patch} (100%) rename divinemc-server/minecraft-patches/features/{0088-Crafter-1gt-delay.patch => 0069-Crafter-1gt-delay.patch} (100%) rename divinemc-server/minecraft-patches/features/{0089-Raytrace-Entity-Tracker.patch => 0070-Raytrace-Entity-Tracker.patch} (100%) rename divinemc-server/minecraft-patches/features/{0090-Async-Join-Thread.patch => 0071-Async-Join-Thread.patch} (100%) rename divinemc-server/minecraft-patches/features/{0092-Leaves-Protocol-Core.patch => 0072-Leaves-Protocol-Core.patch} (97%) rename divinemc-server/minecraft-patches/features/{0093-Leaves-Xaero-s-Map-Protocol.patch => 0073-Leaves-Xaero-s-Map-Protocol.patch} (92%) rename divinemc-server/minecraft-patches/features/{0094-Leaves-Syncmatica-Protocol.patch => 0074-Leaves-Syncmatica-Protocol.patch} (95%) rename divinemc-server/minecraft-patches/features/{0095-Paper-PR-Optimise-non-flush-packet-sending.patch => 0075-Paper-PR-Optimise-non-flush-packet-sending.patch} (100%) rename divinemc-server/minecraft-patches/features/{0096-Linear-region-file-format.patch => 0076-Linear-region-file-format.patch} (100%) rename divinemc-server/minecraft-patches/features/{0097-Cleanup-dead-code-from-Paper.patch => 0077-Cleanup-dead-code-from-Paper.patch} (100%) delete mode 100644 divinemc-server/minecraft-patches/features/0086-Disable-offline-warn-if-using-proxy.patch rename divinemc-server/minecraft-patches/{features/0084-Configurable-player-spawn-tracking-range.patch => sources/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java.patch} (60%) rename divinemc-server/minecraft-patches/{features/0032-Skip-cloning-advancement-criteria.patch => sources/net/minecraft/advancements/Advancement.java.patch} (56%) rename divinemc-server/minecraft-patches/{features/0013-lithium-cached_iterate_outwards.patch => sources/net/minecraft/core/BlockPos.java.patch} (66%) rename divinemc-server/minecraft-patches/{features/0091-Shutdown-executors.patch => sources/net/minecraft/server/MinecraftServer.java.patch} (51%) rename divinemc-server/minecraft-patches/{features/0082-Use-fastutil-for-criterion-data.patch => sources/net/minecraft/server/PlayerAdvancements.java.patch} (67%) rename divinemc-server/minecraft-patches/{features/0010-Pufferfish-SIMD-support.patch => sources/net/minecraft/server/dedicated/DedicatedServer.java.patch} (67%) create mode 100644 divinemc-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch create mode 100644 divinemc-server/minecraft-patches/sources/net/minecraft/server/rcon/RconConsoleSource.java.patch rename divinemc-server/minecraft-patches/{features/0029-VMP-skip-entity-move-if-movement-is-zero.patch => sources/net/minecraft/world/entity/Entity.java.patch} (55%) create mode 100644 divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch create mode 100644 divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java.patch rename divinemc-server/minecraft-patches/{features/0028-lithium-skip-useless-secondary-poi-sensor.patch => sources/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java.patch} (51%) rename divinemc-server/minecraft-patches/{features/0020-Fix-MC-200418.patch => sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch} (56%) create mode 100644 divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch rename divinemc-server/minecraft-patches/{features/0030-VMP-store-mob-counts-in-an-array.patch => sources/net/minecraft/world/level/LocalMobCapCalculator.java.patch} (55%) rename divinemc-server/minecraft-patches/{features/0023-Fix-MC-258859.patch => sources/net/minecraft/world/level/levelgen/SurfaceRules.java.patch} (71%) create mode 100644 divinemc-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/feature/OreFeature.java.patch rename divinemc-server/paper-patches/features/{0015-Virtual-Threads.patch => 0012-Virtual-Threads.patch} (100%) rename divinemc-server/paper-patches/features/{0016-Implement-Secure-Seed.patch => 0013-Implement-Secure-Seed.patch} (100%) rename divinemc-server/paper-patches/features/{0017-Petal-Multithreaded-Tracker.patch => 0014-Petal-Multithreaded-Tracker.patch} (97%) delete mode 100644 divinemc-server/paper-patches/features/0014-Replace-CraftServer-getWorlds-ArrayList-with-a-fastu.patch rename divinemc-server/paper-patches/features/{0018-Pufferfish-Optimize-mob-spawning.patch => 0015-Pufferfish-Optimize-mob-spawning.patch} (100%) rename divinemc-server/paper-patches/features/{0019-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch => 0016-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch} (100%) rename divinemc-server/paper-patches/features/{0020-SparklyPaper-Parallel-world-ticking.patch => 0017-SparklyPaper-Parallel-world-ticking.patch} (100%) rename divinemc-server/paper-patches/features/{0021-Rewrite-ReferenceList.patch => 0018-Rewrite-ReferenceList.patch} (100%) rename divinemc-server/paper-patches/features/{0023-Leaves-Protocol-Core.patch => 0019-Leaves-Protocol-Core.patch} (100%) rename divinemc-server/paper-patches/{features/0022-Configurable-Max-View-Distance.patch => files/src/main/java/ca/spottedleaf/moonrise/common/util/MoonriseConstants.java.patch} (52%) rename divinemc-server/paper-patches/{features/0012-Skip-event-if-no-listeners.patch => files/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java.patch} (68%) create mode 100644 divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch rename divinemc-server/paper-patches/{features/0013-Force-Minecraft-command.patch => files/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java.patch} (61%) diff --git a/divinemc-server/minecraft-patches/features/0001-Rebrand.patch b/divinemc-server/minecraft-patches/features/0001-Rebrand.patch index 0e5a5d2..c76532c 100644 --- a/divinemc-server/minecraft-patches/features/0001-Rebrand.patch +++ b/divinemc-server/minecraft-patches/features/0001-Rebrand.patch @@ -86,10 +86,10 @@ index b06c2c4aa77edafb374f7cf0406cf4d29c6e7f9f..a058ef4d74da29372a894c8a4d619b2d 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 1c064e1d2edcda5d0b10fb3cc3417937ac0b3835..3b6d2cf670caefd42536de896d3e13c96ebf87b1 100644 +index d651ddade8a460c25f4f8d70822d9ef69f1acb4b..8fce263f8cab4e0ff2ee6fe4fd9e46bbd0bbde19 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1176,6 +1176,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.tickCount % autosavePeriod == 0; try { this.isSaving = true; -@@ -1592,10 +1556,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop serverPlayer1.connection.suspendFlushing()); this.server.getScheduler().mainThreadHeartbeat(); // CraftBukkit // Paper start - optimise Folia entity scheduler -@@ -1709,9 +1665,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Purpur - Ridables @@ -429,7 +429,7 @@ index 3b6d2cf670caefd42536de896d3e13c96ebf87b1..16635681a7ed6c6db8434fc14f9ac7c9 try { serverLevel.tick(hasTimeLeft); } catch (Throwable var7) { -@@ -1766,34 +1715,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 1.0E-7) { movement = movement.multiply(this.stuckSpeedMultiplier); this.stuckSpeedMultiplier = Vec3.ZERO; -@@ -1160,7 +1152,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1162,7 +1154,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess // Paper start - ignore movement changes while inactive. if (isTemporarilyActive && !(this instanceof ItemEntity) && movement == getDeltaMovement() && type == MoverType.SELF) { setDeltaMovement(Vec3.ZERO); @@ -4053,7 +4053,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894 return; } // Paper end -@@ -1185,8 +1176,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1187,8 +1178,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.setPos(vec32); } @@ -4062,7 +4062,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894 boolean flag = !Mth.equal(movement.x, vec3.x); boolean flag1 = !Mth.equal(movement.z, vec3.z); this.horizontalCollision = flag || flag1; -@@ -1209,7 +1198,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1211,7 +1200,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } if (this.isRemoved()) { @@ -4071,7 +4071,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894 } else { if (this.horizontalCollision) { Vec3 deltaMovement = this.getDeltaMovement(); -@@ -1253,7 +1242,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1255,7 +1244,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess float blockSpeedFactor = this.getBlockSpeedFactor(); this.setDeltaMovement(this.getDeltaMovement().multiply(blockSpeedFactor, 1.0, blockSpeedFactor)); @@ -4079,7 +4079,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894 } } // Paper start - detailed watchdog information -@@ -3466,8 +3454,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3468,8 +3456,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.processPortalCooldown(); if (this.portalProcess != null) { if (this.portalProcess.processPortalTeleportation(serverLevel, this, this.canUsePortal(false))) { @@ -4088,7 +4088,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894 this.setPortalCooldown(); TeleportTransition portalDestination = this.portalProcess.getPortalDestination(serverLevel, this); if (portalDestination != null) { -@@ -3477,8 +3463,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3479,8 +3465,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.teleport(portalDestination); } } @@ -4097,7 +4097,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894 } else if (this.portalProcess.hasExpired()) { this.portalProcess = null; } -@@ -4045,15 +4029,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4047,15 +4031,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess entity.teleport(this.calculatePassengerTransition(teleportTransition, entity)); } @@ -4113,7 +4113,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894 return this; } -@@ -4069,11 +4050,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4071,11 +4052,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } } @@ -4125,7 +4125,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894 return null; } else { // Paper start - Fix item duplication and teleport issues -@@ -4093,7 +4071,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4095,7 +4073,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess newLevel.resetEmptyTime(); teleportTransition.postTeleportTransition().onTransition(entityx); this.teleportSpectators(teleportTransition, oldLevel); @@ -4134,7 +4134,7 @@ index fa829d84cd47b68426bb30f662de6e05b608cc69..02f39e3dc420a5bd49cd6e247c9b1894 } } diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da175365d8 100644 +index 590ccc9d181d401abd1154ae1f16b1230e8195f1..8df6ceea1536b12d87755c8a69e1b652d280600c 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -69,8 +69,6 @@ import net.minecraft.tags.FluidTags; @@ -4163,7 +4163,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da } @Override -@@ -3364,11 +3359,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -3371,11 +3366,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin f1 = this.getYRot(); } @@ -4175,7 +4175,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da // Paper start - stop large pitch and yaw changes from crashing the server this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F; -@@ -3380,7 +3371,6 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -3387,7 +3378,6 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F; // Paper end - stop large pitch and yaw changes from crashing the server @@ -4183,7 +4183,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da if (this.isFallFlying()) { this.fallFlyTicks++; } else { -@@ -3556,21 +3546,15 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -3563,21 +3553,15 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin } this.setDeltaMovement(d, d1, d2); @@ -4205,7 +4205,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da if (this.jumping && this.isAffectedByFluids()) { double fluidHeight; if (this.isInLava()) { -@@ -3599,8 +3583,6 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -3606,8 +3590,6 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin this.noJumpDelay = 0; } @@ -4214,7 +4214,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da if (this.isFallFlying()) { this.updateFallFlying(); } -@@ -3625,9 +3607,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -3632,9 +3614,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin this.calculateEntityAnimation(this instanceof FlyingAnimal); } @@ -4224,7 +4224,7 @@ index ddd3acbc804cbc07eaccf578349d3f9e0e00b6fc..0c0144679c9d44d50af153c792d7e5da if ((!this.isInPowderSnow || !this.canFreeze()) && !this.freezeLocked) { // Paper - Freeze Tick Lock API this.setTicksFrozen(Math.max(0, this.getTicksFrozen() - 2)); } -@@ -3637,18 +3617,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -3644,18 +3624,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin if (this.tickCount % 40 == 0 && this.isFullyFrozen() && this.canFreeze()) { this.hurtServer(serverLevel, this.damageSources().freeze(), 1.0F); } diff --git a/divinemc-server/minecraft-patches/features/0011-lithium-fast_util.patch b/divinemc-server/minecraft-patches/features/0010-lithium-fast_util.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0011-lithium-fast_util.patch rename to divinemc-server/minecraft-patches/features/0010-lithium-fast_util.patch diff --git a/divinemc-server/minecraft-patches/features/0015-C2ME-Optimize-world-gen-math.patch b/divinemc-server/minecraft-patches/features/0011-C2ME-Optimize-world-gen-math.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0015-C2ME-Optimize-world-gen-math.patch rename to divinemc-server/minecraft-patches/features/0011-C2ME-Optimize-world-gen-math.patch diff --git a/divinemc-server/minecraft-patches/features/0016-Re-Fix-MC-117075.patch b/divinemc-server/minecraft-patches/features/0012-Re-Fix-MC-117075.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0016-Re-Fix-MC-117075.patch rename to divinemc-server/minecraft-patches/features/0012-Re-Fix-MC-117075.patch diff --git a/divinemc-server/minecraft-patches/features/0012-lithium-entity.fast_hand_swing-entity.fast_elytra_ch.patch b/divinemc-server/minecraft-patches/features/0012-lithium-entity.fast_hand_swing-entity.fast_elytra_ch.patch deleted file mode 100644 index 48c6d33..0000000 --- a/divinemc-server/minecraft-patches/features/0012-lithium-entity.fast_hand_swing-entity.fast_elytra_ch.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 01:51:12 +0300 -Subject: [PATCH] lithium: entity.fast_hand_swing + entity.fast_elytra_check - -This patch is based on the following mixins: -* "net/caffeinemc/mods/lithium/mixin/entity/fast_elytra_check/LivingEntityMixin.java" -* "net/caffeinemc/mods/lithium/mixin/entity/fast_hand_swing/LivingEntityMixin.java" -By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) -Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) - -diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index a086c44afc5b3cb04641b4b9cfe28690f6ca2d7e..ab2bfe5589547a5e1b7f26ff100609c4464b61c7 100644 ---- a/net/minecraft/world/entity/LivingEntity.java -+++ b/net/minecraft/world/entity/LivingEntity.java -@@ -2757,6 +2757,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin - } - - protected void updateSwingTime() { -+ if (!this.swinging && this.swingTime == 0) return; // DivineMC - lithium: entity.fast_hand_swing - int currentSwingDuration = this.getCurrentSwingDuration(); - if (this.swinging) { - this.swingTime++; -@@ -3703,6 +3704,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin - protected void updateFallFlying() { - this.checkFallDistanceAccumulation(); - if (!this.level().isClientSide) { -+ if (!this.isFallFlying() && this.fallFlyTicks == 0) return; // DivineMC - lithium: entity.fast_elytra_check - if (!this.canGlide()) { - if (this.getSharedFlag(7) != false && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit - this.setSharedFlag(7, false); diff --git a/divinemc-server/minecraft-patches/features/0024-SparklyPaper-Clear-dirty-stats-after-copying.patch b/divinemc-server/minecraft-patches/features/0013-SparklyPaper-Clear-dirty-stats-after-copying.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0024-SparklyPaper-Clear-dirty-stats-after-copying.patch rename to divinemc-server/minecraft-patches/features/0013-SparklyPaper-Clear-dirty-stats-after-copying.patch diff --git a/divinemc-server/minecraft-patches/features/0025-Async-locate-command.patch b/divinemc-server/minecraft-patches/features/0014-Async-locate-command.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0025-Async-locate-command.patch rename to divinemc-server/minecraft-patches/features/0014-Async-locate-command.patch diff --git a/divinemc-server/minecraft-patches/features/0014-C2ME-Reduce-Allocations.patch b/divinemc-server/minecraft-patches/features/0014-C2ME-Reduce-Allocations.patch deleted file mode 100644 index c1550b7..0000000 --- a/divinemc-server/minecraft-patches/features/0014-C2ME-Reduce-Allocations.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 01:53:38 +0300 -Subject: [PATCH] C2ME: Reduce Allocations - -This patch is based on the following mixin: -"com/ishland/c2me/opts/allocs/mixin/object_pooling_caching/MixinOreFeature.java" -By: ishland -As part of: C2ME (https://github.com/RelativityMC/C2ME-fabric) -Licensed under: MIT (https://opensource.org/licenses/MIT) - -diff --git a/net/minecraft/world/level/levelgen/feature/OreFeature.java b/net/minecraft/world/level/levelgen/feature/OreFeature.java -index c7b46efd4f08067e2c9c5c8b0e8b71a94a79823d..45d43707909685d2494f054d4b9e6451af6c2f72 100644 ---- a/net/minecraft/world/level/levelgen/feature/OreFeature.java -+++ b/net/minecraft/world/level/levelgen/feature/OreFeature.java -@@ -69,7 +69,7 @@ public class OreFeature extends Feature { - int height - ) { - int i = 0; -- BitSet bitSet = new BitSet(width * height * width); -+ BitSet bitSet = org.bxteam.divinemc.util.cache.CachedOrNewBitsGetter.getCachedOrNewBitSet(width * height * width); // DivineMC - C2ME: Reduce Allocations - BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos(); - int i1 = config.size; - double[] doubles = new double[i1 * 4]; diff --git a/divinemc-server/minecraft-patches/features/0026-Carpet-Fixes-RecipeManager-Optimize.patch b/divinemc-server/minecraft-patches/features/0015-Carpet-Fixes-RecipeManager-Optimize.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0026-Carpet-Fixes-RecipeManager-Optimize.patch rename to divinemc-server/minecraft-patches/features/0015-Carpet-Fixes-RecipeManager-Optimize.patch diff --git a/divinemc-server/minecraft-patches/features/0027-lithium-faster-chunk-serialization.patch b/divinemc-server/minecraft-patches/features/0016-lithium-faster-chunk-serialization.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0027-lithium-faster-chunk-serialization.patch rename to divinemc-server/minecraft-patches/features/0016-lithium-faster-chunk-serialization.patch diff --git a/divinemc-server/minecraft-patches/features/0031-C2ME-optimize-noise-generation.patch b/divinemc-server/minecraft-patches/features/0017-C2ME-optimize-noise-generation.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0031-C2ME-optimize-noise-generation.patch rename to divinemc-server/minecraft-patches/features/0017-C2ME-optimize-noise-generation.patch diff --git a/divinemc-server/minecraft-patches/features/0017-Fix-MC-119417.patch b/divinemc-server/minecraft-patches/features/0017-Fix-MC-119417.patch deleted file mode 100644 index 4a6caa9..0000000 --- a/divinemc-server/minecraft-patches/features/0017-Fix-MC-119417.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 01:58:51 +0300 -Subject: [PATCH] Fix MC-119417 - -Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-119417 - -diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index f5ef04f2f9324f8b7168bafb02acc74629df6086..1431a2e386bee22ec10365a38ead349a398d551f 100644 ---- a/net/minecraft/server/level/ServerPlayer.java -+++ b/net/minecraft/server/level/ServerPlayer.java -@@ -2227,6 +2227,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc - this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, gameMode.getId())); - if (gameMode == GameType.SPECTATOR) { - this.removeEntitiesOnShoulder(); -+ this.stopSleeping(); // DivineMC - Fix MC-119417 - this.stopRiding(); - EnchantmentHelper.stopLocationBasedEffects(this); - } else { diff --git a/divinemc-server/minecraft-patches/features/0018-Fix-MC-7569.patch b/divinemc-server/minecraft-patches/features/0018-Fix-MC-7569.patch deleted file mode 100644 index 9f8ffc1..0000000 --- a/divinemc-server/minecraft-patches/features/0018-Fix-MC-7569.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 01:59:43 +0300 -Subject: [PATCH] Fix MC-7569 - -Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-7569 - -diff --git a/net/minecraft/server/rcon/RconConsoleSource.java b/net/minecraft/server/rcon/RconConsoleSource.java -index 1fddeb10c5947c52840e55ca66c50dd4ad5425b9..f50d87c5c4c0c3daa38a70213b8a8af963fff312 100644 ---- a/net/minecraft/server/rcon/RconConsoleSource.java -+++ b/net/minecraft/server/rcon/RconConsoleSource.java -@@ -51,7 +51,7 @@ public class RconConsoleSource implements CommandSource { - - @Override - public void sendSystemMessage(Component component) { -- this.buffer.append(component.getString()); -+ this.buffer.append(component.getString()).append(System.lineSeparator()); // DivineMC - Fix MC-7569 - } - - @Override diff --git a/divinemc-server/minecraft-patches/features/0034-Optimize-block-state-lookup.patch b/divinemc-server/minecraft-patches/features/0018-Optimize-block-state-lookup.patch similarity index 93% rename from divinemc-server/minecraft-patches/features/0034-Optimize-block-state-lookup.patch rename to divinemc-server/minecraft-patches/features/0018-Optimize-block-state-lookup.patch index 09ca985..b64344c 100644 --- a/divinemc-server/minecraft-patches/features/0034-Optimize-block-state-lookup.patch +++ b/divinemc-server/minecraft-patches/features/0018-Optimize-block-state-lookup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize block state lookup diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java -index d11373d6a88f7b3baaf0e04d4f6e0d3837e2ba3b..6d9274f0da9507d0152611d6b7785e0524dedb2d 100644 +index b88254fb3c12b99684c6ede1ae8a6671ffbe9ad6..dbb4142ea38cdf484e74c81103cebb024ae8813d 100644 --- a/net/minecraft/world/level/chunk/LevelChunk.java +++ b/net/minecraft/world/level/chunk/LevelChunk.java @@ -270,11 +270,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p diff --git a/divinemc-server/minecraft-patches/features/0035-Don-t-respond-ping-before-start-fully.patch b/divinemc-server/minecraft-patches/features/0019-Don-t-respond-ping-before-start-fully.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0035-Don-t-respond-ping-before-start-fully.patch rename to divinemc-server/minecraft-patches/features/0019-Don-t-respond-ping-before-start-fully.patch diff --git a/divinemc-server/minecraft-patches/features/0019-Fix-MC-110386.patch b/divinemc-server/minecraft-patches/features/0019-Fix-MC-110386.patch deleted file mode 100644 index 69ce25c..0000000 --- a/divinemc-server/minecraft-patches/features/0019-Fix-MC-110386.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 02:01:33 +0300 -Subject: [PATCH] Fix MC-110386 - -Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-110386 - -diff --git a/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java b/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java -index a8ec1d5f4b0fb0ff26a234235b7d8d9c4b4a2a98..6251cfface8d4bedd58271ace3947a1631e61b66 100644 ---- a/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java -+++ b/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java -@@ -114,6 +114,7 @@ public class HurtByTargetGoal extends TargetGoal { - } - - protected void alertOther(Mob mob, LivingEntity target) { -+ if (mob == target) return; // DivineMC - Fix MC-110386 - mob.setTarget(target, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_NEARBY_ENTITY); // CraftBukkit - reason - } - } diff --git a/divinemc-server/minecraft-patches/features/0036-Respawn-players-that-were-dead-on-server-restart.patch b/divinemc-server/minecraft-patches/features/0020-Respawn-players-that-were-dead-on-server-restart.patch similarity index 94% rename from divinemc-server/minecraft-patches/features/0036-Respawn-players-that-were-dead-on-server-restart.patch rename to divinemc-server/minecraft-patches/features/0020-Respawn-players-that-were-dead-on-server-restart.patch index bd66eda..4d5e987 100644 --- a/divinemc-server/minecraft-patches/features/0036-Respawn-players-that-were-dead-on-server-restart.patch +++ b/divinemc-server/minecraft-patches/features/0020-Respawn-players-that-were-dead-on-server-restart.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Respawn players that were dead on server restart diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index ace14db7bfd154b8a9b27af4a6c57630a3868ac0..abfecaf4467092f7baa02e0f5bbfd23d087f2aa3 100644 +index 6498455c4c2838cbee743f016d8be1fe2fb61f6d..141c19eb290080f762da1e2090dae0609f2e3575 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -971,6 +971,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Sun, 6 Jul 2025 02:03:37 +0300 -Subject: [PATCH] Fix MC-31819 - -Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-31819 - -diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java -index d72e338232b95826b63d784ac0731f5a20bf8dcb..05634e09200fa613b69aafe9b2505dbc9b5c54eb 100644 ---- a/net/minecraft/world/entity/player/Player.java -+++ b/net/minecraft/world/entity/player/Player.java -@@ -1817,6 +1817,11 @@ public abstract class Player extends LivingEntity { - } - - public void causeFoodExhaustion(float exhaustion, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason reason) { -+ // DivineMC start - Fix MC-31819 -+ if (this.level().getDifficulty() == Difficulty.PEACEFUL) { -+ return; -+ } -+ // DivineMC end - Fix MC-31819 - // CraftBukkit end - if (!this.abilities.invulnerable) { - if (!this.level().isClientSide) { diff --git a/divinemc-server/minecraft-patches/features/0038-Configurable-MC-59471.patch b/divinemc-server/minecraft-patches/features/0022-Configurable-MC-59471.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0038-Configurable-MC-59471.patch rename to divinemc-server/minecraft-patches/features/0022-Configurable-MC-59471.patch diff --git a/divinemc-server/minecraft-patches/features/0022-Fix-MC-172801.patch b/divinemc-server/minecraft-patches/features/0022-Fix-MC-172801.patch deleted file mode 100644 index e9bde40..0000000 --- a/divinemc-server/minecraft-patches/features/0022-Fix-MC-172801.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 02:04:33 +0300 -Subject: [PATCH] Fix MC-172801 - -Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-172801 - -diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index ab2bfe5589547a5e1b7f26ff100609c4464b61c7..4149e7eb6f583d80ed179b190dcc02acf1144bef 100644 ---- a/net/minecraft/world/entity/LivingEntity.java -+++ b/net/minecraft/world/entity/LivingEntity.java -@@ -3274,7 +3274,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin - } - - protected float getFlyingSpeed() { -- return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : 0.02F; -+ // DivineMC start - Fix MC-172801 -+ float flyingSpeed = 0.02F; -+ if (this.getAttributes().hasAttribute(Attributes.FLYING_SPEED)) { -+ flyingSpeed = (float) (this.getAttribute(Attributes.FLYING_SPEED).getValue() * 0.049999999254942D); -+ } -+ return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : flyingSpeed; -+ // DivineMC end - Fix MC-172801 - } - - public float getSpeed() { diff --git a/divinemc-server/minecraft-patches/features/0039-Use-Java-s-Math-functions.patch b/divinemc-server/minecraft-patches/features/0023-Use-Java-s-Math-functions.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0039-Use-Java-s-Math-functions.patch rename to divinemc-server/minecraft-patches/features/0023-Use-Java-s-Math-functions.patch diff --git a/divinemc-server/minecraft-patches/features/0040-Disable-leaf-decay.patch b/divinemc-server/minecraft-patches/features/0024-Disable-leaf-decay.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0040-Disable-leaf-decay.patch rename to divinemc-server/minecraft-patches/features/0024-Disable-leaf-decay.patch diff --git a/divinemc-server/minecraft-patches/features/0041-Carpet-Fixes-Fix-Slime-Block-Bounce-Logic.patch b/divinemc-server/minecraft-patches/features/0025-Carpet-Fixes-Fix-Slime-Block-Bounce-Logic.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0041-Carpet-Fixes-Fix-Slime-Block-Bounce-Logic.patch rename to divinemc-server/minecraft-patches/features/0025-Carpet-Fixes-Fix-Slime-Block-Bounce-Logic.patch diff --git a/divinemc-server/minecraft-patches/features/0042-Optimize-entity-brain.patch b/divinemc-server/minecraft-patches/features/0026-Optimize-entity-brain.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0042-Optimize-entity-brain.patch rename to divinemc-server/minecraft-patches/features/0026-Optimize-entity-brain.patch diff --git a/divinemc-server/minecraft-patches/features/0043-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/divinemc-server/minecraft-patches/features/0027-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0043-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to divinemc-server/minecraft-patches/features/0027-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/divinemc-server/minecraft-patches/features/0044-Carpet-Fixes-Optimized-getBiome-method.patch b/divinemc-server/minecraft-patches/features/0028-Carpet-Fixes-Optimized-getBiome-method.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0044-Carpet-Fixes-Optimized-getBiome-method.patch rename to divinemc-server/minecraft-patches/features/0028-Carpet-Fixes-Optimized-getBiome-method.patch diff --git a/divinemc-server/minecraft-patches/features/0045-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch b/divinemc-server/minecraft-patches/features/0029-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0045-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch rename to divinemc-server/minecraft-patches/features/0029-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch diff --git a/divinemc-server/minecraft-patches/features/0046-Carpet-Fixes-Sheep-Optimization.patch b/divinemc-server/minecraft-patches/features/0030-Carpet-Fixes-Sheep-Optimization.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0046-Carpet-Fixes-Sheep-Optimization.patch rename to divinemc-server/minecraft-patches/features/0030-Carpet-Fixes-Sheep-Optimization.patch diff --git a/divinemc-server/minecraft-patches/features/0047-Carpet-AMS-Addition-Optimized-dragon-respawn.patch b/divinemc-server/minecraft-patches/features/0031-Carpet-AMS-Addition-Optimized-dragon-respawn.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0047-Carpet-AMS-Addition-Optimized-dragon-respawn.patch rename to divinemc-server/minecraft-patches/features/0031-Carpet-AMS-Addition-Optimized-dragon-respawn.patch diff --git a/divinemc-server/minecraft-patches/features/0048-ModernFix-compact_bit_storage.patch b/divinemc-server/minecraft-patches/features/0032-ModernFix-compact_bit_storage.patch similarity index 95% rename from divinemc-server/minecraft-patches/features/0048-ModernFix-compact_bit_storage.patch rename to divinemc-server/minecraft-patches/features/0032-ModernFix-compact_bit_storage.patch index eb9ec79..29cd187 100644 --- a/divinemc-server/minecraft-patches/features/0048-ModernFix-compact_bit_storage.patch +++ b/divinemc-server/minecraft-patches/features/0032-ModernFix-compact_bit_storage.patch @@ -10,7 +10,7 @@ As part of: ModernFix (https://github.com/embeddedt/ModernFix) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/level/chunk/PalettedContainer.java b/net/minecraft/world/level/chunk/PalettedContainer.java -index be11a87ab1badca64219d74bc7a4f5d51b818a8c..a87689919a5fd4774eaff534ca85243feb505e84 100644 +index 9d892c1c3890e0aaf13fd5cd7b7d138afeaad260..ca3fab804e464a5db2b47495ecb588a96044265d 100644 --- a/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/net/minecraft/world/level/chunk/PalettedContainer.java @@ -291,6 +291,28 @@ public class PalettedContainer implements PaletteResize, PalettedContainer diff --git a/divinemc-server/minecraft-patches/features/0033-Fix-sprint-glitch.patch b/divinemc-server/minecraft-patches/features/0033-Fix-sprint-glitch.patch deleted file mode 100644 index a6746ed..0000000 --- a/divinemc-server/minecraft-patches/features/0033-Fix-sprint-glitch.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 02:43:50 +0300 -Subject: [PATCH] Fix sprint glitch - - -diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 4149e7eb6f583d80ed179b190dcc02acf1144bef..9a000a4df5df6e36ae25e6d54bfe7cd725df51dd 100644 ---- a/net/minecraft/world/entity/LivingEntity.java -+++ b/net/minecraft/world/entity/LivingEntity.java -@@ -1420,7 +1420,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin - player.setRealHealth(health); - } - -- player.updateScaledHealth(false); -+ this.entityData.set(LivingEntity.DATA_HEALTH_ID, player.getScaledHealth()); // DivineMC - Fix sprint glitch - return; - } - // CraftBukkit end diff --git a/divinemc-server/minecraft-patches/features/0049-Option-to-disable-disconnect.spam.patch b/divinemc-server/minecraft-patches/features/0033-Option-to-disable-disconnect.spam.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0049-Option-to-disable-disconnect.spam.patch rename to divinemc-server/minecraft-patches/features/0033-Option-to-disable-disconnect.spam.patch diff --git a/divinemc-server/minecraft-patches/features/0050-Option-to-disable-saving-of-snowball-and-firework.patch b/divinemc-server/minecraft-patches/features/0034-Option-to-disable-saving-of-snowball-and-firework.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0050-Option-to-disable-saving-of-snowball-and-firework.patch rename to divinemc-server/minecraft-patches/features/0034-Option-to-disable-saving-of-snowball-and-firework.patch diff --git a/divinemc-server/minecraft-patches/features/0051-Snowball-and-Egg-knockback.patch b/divinemc-server/minecraft-patches/features/0035-Snowball-and-Egg-knockback.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0051-Snowball-and-Egg-knockback.patch rename to divinemc-server/minecraft-patches/features/0035-Snowball-and-Egg-knockback.patch diff --git a/divinemc-server/minecraft-patches/features/0052-Optimize-suffocation.patch b/divinemc-server/minecraft-patches/features/0036-Optimize-suffocation.patch similarity index 95% rename from divinemc-server/minecraft-patches/features/0052-Optimize-suffocation.patch rename to divinemc-server/minecraft-patches/features/0036-Optimize-suffocation.patch index 13dfed4..45e229d 100644 --- a/divinemc-server/minecraft-patches/features/0052-Optimize-suffocation.patch +++ b/divinemc-server/minecraft-patches/features/0036-Optimize-suffocation.patch @@ -7,7 +7,7 @@ Original license: GPL v3 Original project: https://github.com/pufferfish-gg/Pufferfish diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index d382a9760c0379f3d1c3bc65303d1de250858343..49cb64c6dd0941eab8f7531e0c182a79e4ec1da6 100644 +index 8df6ceea1536b12d87755c8a69e1b652d280600c..33f33a51a7016e214bca1aec8e6cc3910ec3bb42 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -420,6 +420,12 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/divinemc-server/minecraft-patches/features/0053-Reduce-chunk-loading-lookups.patch b/divinemc-server/minecraft-patches/features/0037-Reduce-chunk-loading-lookups.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0053-Reduce-chunk-loading-lookups.patch rename to divinemc-server/minecraft-patches/features/0037-Reduce-chunk-loading-lookups.patch diff --git a/divinemc-server/minecraft-patches/features/0054-Configurable-movement-speed-for-entities.patch b/divinemc-server/minecraft-patches/features/0038-Configurable-movement-speed-for-entities.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0054-Configurable-movement-speed-for-entities.patch rename to divinemc-server/minecraft-patches/features/0038-Configurable-movement-speed-for-entities.patch diff --git a/divinemc-server/minecraft-patches/features/0055-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch b/divinemc-server/minecraft-patches/features/0039-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0055-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch rename to divinemc-server/minecraft-patches/features/0039-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch diff --git a/divinemc-server/minecraft-patches/features/0056-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch b/divinemc-server/minecraft-patches/features/0040-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0056-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch rename to divinemc-server/minecraft-patches/features/0040-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch diff --git a/divinemc-server/minecraft-patches/features/0057-Option-to-allow-weird-movement-and-disable-teleporti.patch b/divinemc-server/minecraft-patches/features/0041-Option-to-allow-weird-movement-and-disable-teleporti.patch similarity index 98% rename from divinemc-server/minecraft-patches/features/0057-Option-to-allow-weird-movement-and-disable-teleporti.patch rename to divinemc-server/minecraft-patches/features/0041-Option-to-allow-weird-movement-and-disable-teleporti.patch index b73178f..bbe95e9 100644 --- a/divinemc-server/minecraft-patches/features/0057-Option-to-allow-weird-movement-and-disable-teleporti.patch +++ b/divinemc-server/minecraft-patches/features/0041-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 8f4bca6a99b35e869e34f0fa216c13189cd7b384..3ba558634558b4524245a2b29786237f5e38ef42 100644 +index fe7d68f3947bf55a389c73ef301fae8e396bf1da..39b95d3736d5acd3b71675410469727be6405cd3 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -607,7 +607,7 @@ public class ServerGamePacketListenerImpl diff --git a/divinemc-server/minecraft-patches/features/0058-Optimize-Raids.patch b/divinemc-server/minecraft-patches/features/0042-Optimize-Raids.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0058-Optimize-Raids.patch rename to divinemc-server/minecraft-patches/features/0042-Optimize-Raids.patch diff --git a/divinemc-server/minecraft-patches/features/0059-SparklyPaper-Optimize-canSee-checks.patch b/divinemc-server/minecraft-patches/features/0043-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0059-SparklyPaper-Optimize-canSee-checks.patch rename to divinemc-server/minecraft-patches/features/0043-SparklyPaper-Optimize-canSee-checks.patch diff --git a/divinemc-server/minecraft-patches/features/0060-Small-optimization-to-LinearPalette.patch b/divinemc-server/minecraft-patches/features/0044-Small-optimization-to-LinearPalette.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0060-Small-optimization-to-LinearPalette.patch rename to divinemc-server/minecraft-patches/features/0044-Small-optimization-to-LinearPalette.patch diff --git a/divinemc-server/minecraft-patches/features/0061-Use-switch-for-VarInt-write.patch b/divinemc-server/minecraft-patches/features/0045-Use-switch-for-VarInt-write.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0061-Use-switch-for-VarInt-write.patch rename to divinemc-server/minecraft-patches/features/0045-Use-switch-for-VarInt-write.patch diff --git a/divinemc-server/minecraft-patches/features/0062-Optimize-Fluids.patch b/divinemc-server/minecraft-patches/features/0046-Optimize-Fluids.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0062-Optimize-Fluids.patch rename to divinemc-server/minecraft-patches/features/0046-Optimize-Fluids.patch diff --git a/divinemc-server/minecraft-patches/features/0063-Optimize-Structure-Generation.patch b/divinemc-server/minecraft-patches/features/0047-Optimize-Structure-Generation.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0063-Optimize-Structure-Generation.patch rename to divinemc-server/minecraft-patches/features/0047-Optimize-Structure-Generation.patch diff --git a/divinemc-server/minecraft-patches/features/0064-Implement-NoChatReports.patch b/divinemc-server/minecraft-patches/features/0048-Implement-NoChatReports.patch similarity index 98% rename from divinemc-server/minecraft-patches/features/0064-Implement-NoChatReports.patch rename to divinemc-server/minecraft-patches/features/0048-Implement-NoChatReports.patch index 7c2fc7a..16db10b 100644 --- a/divinemc-server/minecraft-patches/features/0064-Implement-NoChatReports.patch +++ b/divinemc-server/minecraft-patches/features/0048-Implement-NoChatReports.patch @@ -206,7 +206,7 @@ index a491be4250de3199c3e1aa9e5482b568692bd2f5..c88826db76c28c536e6c36c5592d69c1 private static final String PREFIX = "data:image/png;base64,"; public static final Codec CODEC = Codec.STRING.comapFlatMap(string -> { diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index a947fc31f6261531b6f28e5af577e74ca84f2132..021e1cb762d23ebe885a3f190ba2431e1db99bb8 100644 +index ac35fc08574a72be356c48fb6e1cfafe36cd0860..dcd004749846aa9e650be438b0f097e414c2ec76 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -623,6 +623,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -287,7 +287,7 @@ index 667ef5b2ab50eeb0491f7fe0bc8913ec29a4603a..a7c4fad2b1cb0cbac742a18d37d688bb if (packet == null || this.processedDisconnect) { // Spigot return; diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index fb1b9f75cffeb15875e6690a0e030f8a4fd8b276..6713eb83b36f115e72fa5999c413e59e4f634f9f 100644 +index 7ed75ef10e3d4504cebb0ad544e05d9544642c9e..3165fd57f8f04251f220716beab49f6f43736eeb 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -276,7 +276,7 @@ public abstract class PlayerList { diff --git a/divinemc-server/minecraft-patches/features/0065-Lag-compensation.patch b/divinemc-server/minecraft-patches/features/0049-Lag-compensation.patch similarity index 98% rename from divinemc-server/minecraft-patches/features/0065-Lag-compensation.patch rename to divinemc-server/minecraft-patches/features/0049-Lag-compensation.patch index 4805345..3e277d2 100644 --- a/divinemc-server/minecraft-patches/features/0065-Lag-compensation.patch +++ b/divinemc-server/minecraft-patches/features/0049-Lag-compensation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Lag compensation diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 7a3775185d5c80f43456a595f22a9ebf19760bd6..23144971acc04bbeacd719dafe2363d1618153b9 100644 +index 141c19eb290080f762da1e2090dae0609f2e3575..5a7cb4cffa218a17300c74ee4d95b08b705324ea 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -288,6 +288,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function threadFunction) { ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.init(); // Paper - rewrite data converter system -@@ -1534,6 +1535,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 23144971acc04bbeacd719dafe2363d1618153b9..7dbefd83d164a7d97a56b02862fef3b2f17d5aab 100644 +index 5a7cb4cffa218a17300c74ee4d95b08b705324ea..4a53105e46e338a52bc5ad22d51688a9a261d9e5 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -2639,8 +2639,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 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 985a5168f7f81fb934e791618362b7c6e71ff893..acbae905cd22511be417600c68c6944b80acd2d7 100644 +index ed4a722c0fa458a0977366b92561d6a16827da56..9f5beb74d8b0198aebf7cad40def52d12a4a9b3d 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -290,6 +290,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop serverPlayer1.connection.suspendFlushing()); this.server.getScheduler().mainThreadHeartbeat(); // CraftBukkit -@@ -1705,28 +1730,43 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop, ServerLevel> oldLevels = this.levels; Map, ServerLevel> newLevels = Maps.newLinkedHashMap(oldLevels); newLevels.remove(level.dimension()); @@ -233,7 +233,7 @@ index 985a5168f7f81fb934e791618362b7c6e71ff893..acbae905cd22511be417600c68c6944b } // CraftBukkit end diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java -index 10e5469df1800bcdfb3f8cb4045ee25a4bafc58c..8efed0ffdc906b6c1ba054831e481f53c11f102d 100644 +index 3836d60ce84fb26f30a609486a5755d3fd1c94f1..1aab02441e4dfa7703963855d77bb918dee7a6fc 100644 --- a/net/minecraft/server/PlayerAdvancements.java +++ b/net/minecraft/server/PlayerAdvancements.java @@ -54,6 +54,7 @@ public class PlayerAdvancements { @@ -333,7 +333,7 @@ index 10e5469df1800bcdfb3f8cb4045ee25a4bafc58c..8efed0ffdc906b6c1ba054831e481f53 } } else if (this.visible.remove(advancementHolder)) { diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index 021e1cb762d23ebe885a3f190ba2431e1db99bb8..8820d1789192247c52b4d821abf2dd23c0bf1b62 100644 +index dcd004749846aa9e650be438b0f097e414c2ec76..5a2b9632a1e46b512a1379923765c1b8a28250b9 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -218,6 +218,13 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -513,7 +513,7 @@ index 1431a2e386bee22ec10365a38ead349a398d551f..77d1cab278a13e08ba8096af2c683b50 // Paper end - Inventory close reason this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId)); diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 6713eb83b36f115e72fa5999c413e59e4f634f9f..08e337ae96c444da2e50240c808c76a548cd4c12 100644 +index 3165fd57f8f04251f220716beab49f6f43736eeb..df47a3dc31a01464088eba21f4139f63d69895e5 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -149,6 +149,7 @@ public abstract class PlayerList { diff --git a/divinemc-server/minecraft-patches/features/0079-MSPT-Tracking-for-each-world.patch b/divinemc-server/minecraft-patches/features/0063-MSPT-Tracking-for-each-world.patch similarity index 93% rename from divinemc-server/minecraft-patches/features/0079-MSPT-Tracking-for-each-world.patch rename to divinemc-server/minecraft-patches/features/0063-MSPT-Tracking-for-each-world.patch index b04c8ab..a47025b 100644 --- a/divinemc-server/minecraft-patches/features/0079-MSPT-Tracking-for-each-world.patch +++ b/divinemc-server/minecraft-patches/features/0063-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 101dce7741f74dd79b333fd6cf38a97cb0c832f8..c0a272285e244e0267e6ef776aef14524e63c076 100644 +index 9f5beb74d8b0198aebf7cad40def52d12a4a9b3d..4bbb9b8701e4f5a411a12b8fd977e6de19a22b26 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1676,7 +1676,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Thu, 10 Jul 2025 04:21:08 +0300 -Subject: [PATCH] Disable offline warn if using proxy - - -diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index 8820d1789192247c52b4d821abf2dd23c0bf1b62..5a2b9632a1e46b512a1379923765c1b8a28250b9 100644 ---- a/net/minecraft/server/dedicated/DedicatedServer.java -+++ b/net/minecraft/server/dedicated/DedicatedServer.java -@@ -305,7 +305,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord"; - String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/"; - // Paper end - Add Velocity IP Forwarding Support -- if (!this.usesAuthentication()) { -+ if (!io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // DivineMC - Disable offline warn if using proxy - LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); - LOGGER.warn("The server will make no attempt to authenticate usernames. Beware."); - // Spigot start diff --git a/divinemc-server/minecraft-patches/features/0084-Configurable-player-spawn-tracking-range.patch b/divinemc-server/minecraft-patches/sources/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java.patch similarity index 60% rename from divinemc-server/minecraft-patches/features/0084-Configurable-player-spawn-tracking-range.patch rename to divinemc-server/minecraft-patches/sources/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java.patch index aa79ad8..71edb35 100644 --- a/divinemc-server/minecraft-patches/features/0084-Configurable-player-spawn-tracking-range.patch +++ b/divinemc-server/minecraft-patches/sources/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java.patch @@ -1,14 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Wed, 9 Jul 2025 04:40:45 +0300 -Subject: [PATCH] Configurable player spawn tracking range - - -diff --git a/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java b/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java -index 6d1fe8028739145b11fce98ad62b2f8044299548..9f086ded18d1fc8850877c6be113d88074427526 100644 --- a/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java +++ b/ca/spottedleaf/moonrise/patches/chunk_tick_iteration/ChunkTickConstants.java -@@ -2,7 +2,7 @@ package ca.spottedleaf.moonrise.patches.chunk_tick_iteration; +@@ -2,7 +_,7 @@ public final class ChunkTickConstants { diff --git a/divinemc-server/minecraft-patches/features/0032-Skip-cloning-advancement-criteria.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/advancements/Advancement.java.patch similarity index 56% rename from divinemc-server/minecraft-patches/features/0032-Skip-cloning-advancement-criteria.patch rename to divinemc-server/minecraft-patches/sources/net/minecraft/advancements/Advancement.java.patch index ed20d09..fc813cb 100644 --- a/divinemc-server/minecraft-patches/features/0032-Skip-cloning-advancement-criteria.patch +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/advancements/Advancement.java.patch @@ -1,14 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 02:42:57 +0300 -Subject: [PATCH] Skip cloning advancement criteria - - -diff --git a/net/minecraft/advancements/Advancement.java b/net/minecraft/advancements/Advancement.java -index ac6a85ddf6eb326b3fd53341a4a5db7bd00b7ce2..52a285db9557b2e44d2dcae9fabdb0d78d3e7ec6 100644 --- a/net/minecraft/advancements/Advancement.java +++ b/net/minecraft/advancements/Advancement.java -@@ -61,7 +61,7 @@ public record Advancement( +@@ -61,7 +_,7 @@ AdvancementRequirements requirements, boolean sendsTelemetryEvent ) { diff --git a/divinemc-server/minecraft-patches/features/0013-lithium-cached_iterate_outwards.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch similarity index 66% rename from divinemc-server/minecraft-patches/features/0013-lithium-cached_iterate_outwards.patch rename to divinemc-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch index c531d35..fb2c309 100644 --- a/divinemc-server/minecraft-patches/features/0013-lithium-cached_iterate_outwards.patch +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch @@ -1,17 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 01:52:18 +0300 -Subject: [PATCH] lithium: cached_iterate_outwards - -By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) -Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) - -diff --git a/net/minecraft/core/BlockPos.java b/net/minecraft/core/BlockPos.java -index 6518d3fff6daf331b24a7bf5b39fa1920b73711d..0dc73d76c2d86e05bedb3eb4f51d638c17390277 100644 --- a/net/minecraft/core/BlockPos.java +++ b/net/minecraft/core/BlockPos.java -@@ -347,7 +347,18 @@ public class BlockPos extends Vec3i { +@@ -347,7 +_,18 @@ }; } diff --git a/divinemc-server/minecraft-patches/features/0091-Shutdown-executors.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch similarity index 51% rename from divinemc-server/minecraft-patches/features/0091-Shutdown-executors.patch rename to divinemc-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch index cd6e003..6cd07b9 100644 --- a/divinemc-server/minecraft-patches/features/0091-Shutdown-executors.patch +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch @@ -1,14 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Thu, 10 Jul 2025 17:39:29 +0300 -Subject: [PATCH] Shutdown executors - - -diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 6361d8abdeb045923e8ce64f02cbb7a9ed949d1e..b31a4edee0616a63026f7a4335205f2d99d2f641 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1081,6 +1081,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Wed, 9 Jul 2025 03:41:32 +0300 -Subject: [PATCH] Use fastutil for criterion data - - -diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java -index 8efed0ffdc906b6c1ba054831e481f53c11f102d..1aab02441e4dfa7703963855d77bb918dee7a6fc 100644 --- a/net/minecraft/server/PlayerAdvancements.java +++ b/net/minecraft/server/PlayerAdvancements.java -@@ -61,7 +61,7 @@ public class PlayerAdvancements { +@@ -60,7 +_,7 @@ private AdvancementHolder lastSelectedTab; private boolean isFirstPacket = true; private final Codec codec; diff --git a/divinemc-server/minecraft-patches/features/0010-Pufferfish-SIMD-support.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch similarity index 67% rename from divinemc-server/minecraft-patches/features/0010-Pufferfish-SIMD-support.patch rename to divinemc-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch index b7094ad..34470f9 100644 --- a/divinemc-server/minecraft-patches/features/0010-Pufferfish-SIMD-support.patch +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch @@ -1,17 +1,7 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 02:55:43 +0300 -Subject: [PATCH] Pufferfish: SIMD support - -Original license: GPL v3 -Original project: https://github.com/pufferfish-gg/Pufferfish - -diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index 06657a0fbf65dd095519d706dd5a8e1d8b6b381a..a947fc31f6261531b6f28e5af577e74ca84f2132 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java -@@ -198,6 +198,26 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - org.bxteam.divinemc.command.DivineCommands.registerCommands(this); // DivineMC - Configuration +@@ -195,6 +_,26 @@ + // Purpur end - Purpur config files com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now + // DivineMC start - Pufferfish SIMD @@ -37,3 +27,12 @@ index 06657a0fbf65dd095519d706dd5a8e1d8b6b381a..a947fc31f6261531b6f28e5af577e74c this.setPvpAllowed(properties.pvp); this.setFlightAllowed(properties.allowFlight); this.setMotd(properties.motd); +@@ -275,7 +_,7 @@ + String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord"; + String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/"; + // Paper end - Add Velocity IP Forwarding Support +- if (!this.usesAuthentication()) { ++ if (!io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // DivineMC - Disable offline warn if using proxy + LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); + LOGGER.warn("The server will make no attempt to authenticate usernames. Beware."); + // Spigot start diff --git a/divinemc-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch new file mode 100644 index 0000000..8c8ed02 --- /dev/null +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch @@ -0,0 +1,10 @@ +--- a/net/minecraft/server/level/ServerPlayer.java ++++ b/net/minecraft/server/level/ServerPlayer.java +@@ -2233,6 +_,7 @@ + this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, gameMode.getId())); + if (gameMode == GameType.SPECTATOR) { + this.removeEntitiesOnShoulder(); ++ this.stopSleeping(); // DivineMC - Fix MC-119417 + this.stopRiding(); + EnchantmentHelper.stopLocationBasedEffects(this); + } else { diff --git a/divinemc-server/minecraft-patches/sources/net/minecraft/server/rcon/RconConsoleSource.java.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/server/rcon/RconConsoleSource.java.patch new file mode 100644 index 0000000..8711080 --- /dev/null +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/server/rcon/RconConsoleSource.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/server/rcon/RconConsoleSource.java ++++ b/net/minecraft/server/rcon/RconConsoleSource.java +@@ -51,7 +_,7 @@ + + @Override + public void sendSystemMessage(Component component) { +- this.buffer.append(component.getString()); ++ this.buffer.append(component.getString()).append(System.lineSeparator()); // DivineMC - Fix MC-7569 + } + + @Override diff --git a/divinemc-server/minecraft-patches/features/0029-VMP-skip-entity-move-if-movement-is-zero.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch similarity index 55% rename from divinemc-server/minecraft-patches/features/0029-VMP-skip-entity-move-if-movement-is-zero.patch rename to divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch index 6a3d39e..61cf3bd 100644 --- a/divinemc-server/minecraft-patches/features/0029-VMP-skip-entity-move-if-movement-is-zero.patch +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch @@ -1,19 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 02:30:53 +0300 -Subject: [PATCH] VMP: skip entity move if movement is zero - -This patch is based on the following mixin: -"com/ishland/vmp/mixins/entity/move_zero_velocity/MixinEntity.java" -By: ishland -As part of: VMP (https://github.com/RelativityMC/VMP-fabric) -Licensed under: MIT (https://opensource.org/licenses/MIT) - -diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 02f39e3dc420a5bd49cd6e247c9b1894dc49d303..0171befef713e89d9241c7735d5d285b23373e8f 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -372,6 +372,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -374,6 +_,7 @@ public boolean isTemporarilyActive; public long activatedImmunityTick = Integer.MIN_VALUE; public @Nullable Boolean immuneToFire = null; // Purpur - Fire immune API @@ -21,7 +8,7 @@ index 02f39e3dc420a5bd49cd6e247c9b1894dc49d303..0171befef713e89d9241c7735d5d285b public void inactiveTick() { } -@@ -1119,6 +1120,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1125,6 +_,7 @@ // Paper end - detailed watchdog information public void move(MoverType type, Vec3 movement) { @@ -29,7 +16,7 @@ index 02f39e3dc420a5bd49cd6e247c9b1894dc49d303..0171befef713e89d9241c7735d5d285b final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity // Paper start - detailed watchdog information ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main"); -@@ -4425,6 +4427,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4448,6 +_,7 @@ } public final void setBoundingBox(AABB bb) { diff --git a/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch new file mode 100644 index 0000000..27fed65 --- /dev/null +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch @@ -0,0 +1,42 @@ +--- a/net/minecraft/world/entity/LivingEntity.java ++++ b/net/minecraft/world/entity/LivingEntity.java +@@ -1425,7 +_,7 @@ + player.setRealHealth(health); + } + +- player.updateScaledHealth(false); ++ this.entityData.set(LivingEntity.DATA_HEALTH_ID, player.getScaledHealth()); // DivineMC - Fix sprint glitch + return; + } + // CraftBukkit end +@@ -2762,6 +_,7 @@ + } + + protected void updateSwingTime() { ++ if (!this.swinging && this.swingTime == 0) return; // DivineMC - lithium: entity.fast_hand_swing + int currentSwingDuration = this.getCurrentSwingDuration(); + if (this.swinging) { + this.swingTime++; +@@ -3278,7 +_,13 @@ + } + + protected float getFlyingSpeed() { +- return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : 0.02F; ++ // DivineMC start - Fix MC-172801 ++ float flyingSpeed = 0.02F; ++ if (this.getAttributes().hasAttribute(Attributes.FLYING_SPEED)) { ++ flyingSpeed = (float) (this.getAttribute(Attributes.FLYING_SPEED).getValue() * 0.049999999254942D); ++ } ++ return this.getControllingPassenger() instanceof net.minecraft.world.entity.player.Player ? this.getSpeed() * 0.1F : flyingSpeed; ++ // DivineMC end - Fix MC-172801 + } + + public float getSpeed() { +@@ -3727,6 +_,7 @@ + protected void updateFallFlying() { + this.checkFallDistanceAccumulation(); + if (!this.level().isClientSide) { ++ if (!this.isFallFlying() && this.fallFlyTicks == 0) return; // DivineMC - lithium: entity.fast_elytra_check + if (!this.canGlide()) { + if (this.getSharedFlag(7) != false && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit + this.setSharedFlag(7, false); diff --git a/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java.patch new file mode 100644 index 0000000..e825eb7 --- /dev/null +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java.patch @@ -0,0 +1,10 @@ +--- a/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java ++++ b/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java +@@ -114,6 +_,7 @@ + } + + protected void alertOther(Mob mob, LivingEntity target) { ++ if (mob == target) return; // DivineMC - Fix MC-110386 + mob.setTarget(target, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_NEARBY_ENTITY); // CraftBukkit - reason + } + } diff --git a/divinemc-server/minecraft-patches/features/0028-lithium-skip-useless-secondary-poi-sensor.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java.patch similarity index 51% rename from divinemc-server/minecraft-patches/features/0028-lithium-skip-useless-secondary-poi-sensor.patch rename to divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java.patch index f128993..7bca1f5 100644 --- a/divinemc-server/minecraft-patches/features/0028-lithium-skip-useless-secondary-poi-sensor.patch +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java.patch @@ -1,23 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 02:26:11 +0300 -Subject: [PATCH] lithium: skip useless secondary poi sensor - -This patch is based on the following mixin: -"net/caffeinemc/mods/lithium/mixin/ai/sensor/secondary_poi/SecondaryPoiSensorMixin.java" -By: 2No2Name <2No2Name@web.de> -As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) -Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) - -Lithium description: - -villagers that have no secondary POI (farmland) do not search for it - -diff --git a/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java b/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java -index dc4a9ddb8479e9d0c4895b19d7d677cdd8ad3faa..c3911232667ae9e1f70397f6ff5e7608694248fa 100644 --- a/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java +++ b/net/minecraft/world/entity/ai/sensing/SecondaryPoiSensor.java -@@ -22,6 +22,12 @@ public class SecondaryPoiSensor extends Sensor { +@@ -22,6 +_,12 @@ @Override protected void doTick(ServerLevel level, Villager entity) { diff --git a/divinemc-server/minecraft-patches/features/0020-Fix-MC-200418.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch similarity index 56% rename from divinemc-server/minecraft-patches/features/0020-Fix-MC-200418.patch rename to divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch index 28eb299..1927ea1 100644 --- a/divinemc-server/minecraft-patches/features/0020-Fix-MC-200418.patch +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/monster/ZombieVillager.java.patch @@ -1,15 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 02:02:47 +0300 -Subject: [PATCH] Fix MC-200418 - -Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-200418 - -diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java -index e218e5d5f146ec996a6f5ce7e76b1d6506ac1cb9..00af89717bf2459b315baf70a515a0e68267fb9f 100644 --- a/net/minecraft/world/entity/monster/ZombieVillager.java +++ b/net/minecraft/world/entity/monster/ZombieVillager.java -@@ -292,6 +292,12 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder { +@@ -292,6 +_,12 @@ if (!this.isSilent()) { level.levelEvent(null, 1027, this.blockPosition(), 0); } diff --git a/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch new file mode 100644 index 0000000..6fa3074 --- /dev/null +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch @@ -0,0 +1,14 @@ +--- a/net/minecraft/world/entity/player/Player.java ++++ b/net/minecraft/world/entity/player/Player.java +@@ -1817,6 +_,11 @@ + } + + public void causeFoodExhaustion(float exhaustion, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason reason) { ++ // DivineMC start - Fix MC-31819 ++ if (this.level().getDifficulty() == Difficulty.PEACEFUL) { ++ return; ++ } ++ // DivineMC end - Fix MC-31819 + // CraftBukkit end + if (!this.abilities.invulnerable) { + if (!this.level().isClientSide) { diff --git a/divinemc-server/minecraft-patches/features/0030-VMP-store-mob-counts-in-an-array.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/world/level/LocalMobCapCalculator.java.patch similarity index 55% rename from divinemc-server/minecraft-patches/features/0030-VMP-store-mob-counts-in-an-array.patch rename to divinemc-server/minecraft-patches/sources/net/minecraft/world/level/LocalMobCapCalculator.java.patch index aa8fb34..d24f9dd 100644 --- a/divinemc-server/minecraft-patches/features/0030-VMP-store-mob-counts-in-an-array.patch +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/world/level/LocalMobCapCalculator.java.patch @@ -1,19 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 02:33:29 +0300 -Subject: [PATCH] VMP: store mob counts in an array - -This patch is based on the following mixin: -"com/ishland/vmp/mixins/general/spawn_density_cap/MixinSpawnDensityCapperDensityCap.java" -By: ishland -As part of: VMP (https://github.com/RelativityMC/VMP-fabric) -Licensed under: MIT (https://opensource.org/licenses/MIT) - -diff --git a/net/minecraft/world/level/LocalMobCapCalculator.java b/net/minecraft/world/level/LocalMobCapCalculator.java -index 9641219c190261dea0db5f95f040a705ba0a3ff9..d9fe183dbf072f82afae63792967d6e7953d7151 100644 --- a/net/minecraft/world/level/LocalMobCapCalculator.java +++ b/net/minecraft/world/level/LocalMobCapCalculator.java -@@ -42,14 +42,14 @@ public class LocalMobCapCalculator { +@@ -42,14 +_,14 @@ } static class MobCounts { diff --git a/divinemc-server/minecraft-patches/features/0023-Fix-MC-258859.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/SurfaceRules.java.patch similarity index 71% rename from divinemc-server/minecraft-patches/features/0023-Fix-MC-258859.patch rename to divinemc-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/SurfaceRules.java.patch index 7c01f8c..4dcf4ce 100644 --- a/divinemc-server/minecraft-patches/features/0023-Fix-MC-258859.patch +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/SurfaceRules.java.patch @@ -1,15 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Sun, 6 Jul 2025 02:08:04 +0300 -Subject: [PATCH] Fix MC-258859 - -Issue on Mojira: https://bugs.mojang.com/browse/MC/issues/MC-258859 - -diff --git a/net/minecraft/world/level/levelgen/SurfaceRules.java b/net/minecraft/world/level/levelgen/SurfaceRules.java -index 0948c8db90605a15a043b5c5bc74edecd7f9db1b..32757c6847cf77862a2f1b38cc53e7166e6be492 100644 --- a/net/minecraft/world/level/levelgen/SurfaceRules.java +++ b/net/minecraft/world/level/levelgen/SurfaceRules.java -@@ -397,6 +397,22 @@ public class SurfaceRules { +@@ -397,6 +_,22 @@ @Override protected boolean compute() { diff --git a/divinemc-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/feature/OreFeature.java.patch b/divinemc-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/feature/OreFeature.java.patch new file mode 100644 index 0000000..73ccba3 --- /dev/null +++ b/divinemc-server/minecraft-patches/sources/net/minecraft/world/level/levelgen/feature/OreFeature.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/level/levelgen/feature/OreFeature.java ++++ b/net/minecraft/world/level/levelgen/feature/OreFeature.java +@@ -69,7 +_,7 @@ + int height + ) { + int i = 0; +- BitSet bitSet = new BitSet(width * height * width); ++ BitSet bitSet = org.bxteam.divinemc.util.cache.CachedOrNewBitsGetter.getCachedOrNewBitSet(width * height * width); // DivineMC - C2ME: Reduce Allocations + BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos(); + int i1 = config.size; + double[] doubles = new double[i1 * 4]; diff --git a/divinemc-server/paper-patches/features/0003-Delete-timings.patch b/divinemc-server/paper-patches/features/0003-Delete-timings.patch index 986ad86..95875e7 100644 --- a/divinemc-server/paper-patches/features/0003-Delete-timings.patch +++ b/divinemc-server/paper-patches/features/0003-Delete-timings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Delete timings diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java -index 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..11e5b9ebafa562e5a93643d954839e86d0b731f0 100644 +index e989053b703fddfbffc3e4ed9381594aaaa0df41..d7398b1ecf2660c29fb7d106b48fe02d3736603e 100644 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java @@ -1,6 +1,5 @@ @@ -15,7 +15,7 @@ index 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..11e5b9ebafa562e5a93643d954839e86 import com.destroystokyo.paper.event.server.ServerExceptionEvent; import com.destroystokyo.paper.exception.ServerEventException; import com.google.common.collect.Sets; -@@ -95,7 +94,6 @@ class PaperEventManager { +@@ -96,7 +95,6 @@ class PaperEventManager { throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled"); } @@ -23,7 +23,7 @@ index 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..11e5b9ebafa562e5a93643d954839e86 this.getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled)); } -@@ -182,7 +180,7 @@ class PaperEventManager { +@@ -183,7 +181,7 @@ class PaperEventManager { } } diff --git a/divinemc-server/paper-patches/features/0015-Virtual-Threads.patch b/divinemc-server/paper-patches/features/0012-Virtual-Threads.patch similarity index 100% rename from divinemc-server/paper-patches/features/0015-Virtual-Threads.patch rename to divinemc-server/paper-patches/features/0012-Virtual-Threads.patch diff --git a/divinemc-server/paper-patches/features/0016-Implement-Secure-Seed.patch b/divinemc-server/paper-patches/features/0013-Implement-Secure-Seed.patch similarity index 100% rename from divinemc-server/paper-patches/features/0016-Implement-Secure-Seed.patch rename to divinemc-server/paper-patches/features/0013-Implement-Secure-Seed.patch diff --git a/divinemc-server/paper-patches/features/0017-Petal-Multithreaded-Tracker.patch b/divinemc-server/paper-patches/features/0014-Petal-Multithreaded-Tracker.patch similarity index 97% rename from divinemc-server/paper-patches/features/0017-Petal-Multithreaded-Tracker.patch rename to divinemc-server/paper-patches/features/0014-Petal-Multithreaded-Tracker.patch index b78e3ec..3577d80 100644 --- a/divinemc-server/paper-patches/features/0017-Petal-Multithreaded-Tracker.patch +++ b/divinemc-server/paper-patches/features/0014-Petal-Multithreaded-Tracker.patch @@ -45,7 +45,7 @@ index 4913ac7d0426025689c8aee3790d87f7ac0131fd..d4d3aeae964d9a64805ddc5862e46fff break; } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d10ee84ed2f6b1c81667b968984f3ebf5c39e445..83c6cf3cb062c8a6508728822e37d52a543415a3 100644 +index 67d25c18b1d13da3294572ea4ec17f2d18cba43c..87d9228e7ec8688e7949c4472224c6b920bb83c4 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1808,6 +1808,26 @@ public class CraftEventFactory { diff --git a/divinemc-server/paper-patches/features/0014-Replace-CraftServer-getWorlds-ArrayList-with-a-fastu.patch b/divinemc-server/paper-patches/features/0014-Replace-CraftServer-getWorlds-ArrayList-with-a-fastu.patch deleted file mode 100644 index 7038f60..0000000 --- a/divinemc-server/paper-patches/features/0014-Replace-CraftServer-getWorlds-ArrayList-with-a-fastu.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Mon, 7 Jul 2025 04:06:32 +0300 -Subject: [PATCH] Replace CraftServer#getWorlds ArrayList with a fastutil - ObjectArrayList - -CraftServer#getWorlds is frequently used in some plugins, so replacing ArrayList with fastutil ObjectArrayList will give some performance boost - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 17022a57cb06b0ddd0df94075c0d92b68137d901..414fdc6ca7a2979124a7fbf529bff60f993c005a 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -974,7 +974,7 @@ public final class CraftServer implements Server { - - @Override - public List getWorlds() { -- return new ArrayList(this.worlds.values()); -+ return new it.unimi.dsi.fastutil.objects.ObjectArrayList(this.worlds.values()); // DivineMC - Replace CraftServer#getWorlds ArrayList with a fastutil ObjectArrayList - } - - @Override diff --git a/divinemc-server/paper-patches/features/0018-Pufferfish-Optimize-mob-spawning.patch b/divinemc-server/paper-patches/features/0015-Pufferfish-Optimize-mob-spawning.patch similarity index 100% rename from divinemc-server/paper-patches/features/0018-Pufferfish-Optimize-mob-spawning.patch rename to divinemc-server/paper-patches/features/0015-Pufferfish-Optimize-mob-spawning.patch diff --git a/divinemc-server/paper-patches/features/0019-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch b/divinemc-server/paper-patches/features/0016-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch similarity index 100% rename from divinemc-server/paper-patches/features/0019-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch rename to divinemc-server/paper-patches/features/0016-Pufferfish-Simpler-ShapelessRecipes-comparison-for-V.patch diff --git a/divinemc-server/paper-patches/features/0020-SparklyPaper-Parallel-world-ticking.patch b/divinemc-server/paper-patches/features/0017-SparklyPaper-Parallel-world-ticking.patch similarity index 100% rename from divinemc-server/paper-patches/features/0020-SparklyPaper-Parallel-world-ticking.patch rename to divinemc-server/paper-patches/features/0017-SparklyPaper-Parallel-world-ticking.patch diff --git a/divinemc-server/paper-patches/features/0021-Rewrite-ReferenceList.patch b/divinemc-server/paper-patches/features/0018-Rewrite-ReferenceList.patch similarity index 100% rename from divinemc-server/paper-patches/features/0021-Rewrite-ReferenceList.patch rename to divinemc-server/paper-patches/features/0018-Rewrite-ReferenceList.patch diff --git a/divinemc-server/paper-patches/features/0023-Leaves-Protocol-Core.patch b/divinemc-server/paper-patches/features/0019-Leaves-Protocol-Core.patch similarity index 100% rename from divinemc-server/paper-patches/features/0023-Leaves-Protocol-Core.patch rename to divinemc-server/paper-patches/features/0019-Leaves-Protocol-Core.patch diff --git a/divinemc-server/paper-patches/features/0022-Configurable-Max-View-Distance.patch b/divinemc-server/paper-patches/files/src/main/java/ca/spottedleaf/moonrise/common/util/MoonriseConstants.java.patch similarity index 52% rename from divinemc-server/paper-patches/features/0022-Configurable-Max-View-Distance.patch rename to divinemc-server/paper-patches/files/src/main/java/ca/spottedleaf/moonrise/common/util/MoonriseConstants.java.patch index fdc3795..d8f4677 100644 --- a/divinemc-server/paper-patches/features/0022-Configurable-Max-View-Distance.patch +++ b/divinemc-server/paper-patches/files/src/main/java/ca/spottedleaf/moonrise/common/util/MoonriseConstants.java.patch @@ -1,14 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Wed, 9 Jul 2025 04:40:05 +0300 -Subject: [PATCH] Configurable Max View Distance - - -diff --git a/src/main/java/ca/spottedleaf/moonrise/common/util/MoonriseConstants.java b/src/main/java/ca/spottedleaf/moonrise/common/util/MoonriseConstants.java -index 559c959aff3c9deef867b9e425fba3e2e669cac6..00aac7b5b610746f619b07502ceea5dd87e36ff7 100644 --- a/src/main/java/ca/spottedleaf/moonrise/common/util/MoonriseConstants.java +++ b/src/main/java/ca/spottedleaf/moonrise/common/util/MoonriseConstants.java -@@ -4,7 +4,7 @@ import ca.spottedleaf.moonrise.common.PlatformHooks; +@@ -4,7 +_,7 @@ public final class MoonriseConstants { diff --git a/divinemc-server/paper-patches/features/0012-Skip-event-if-no-listeners.patch b/divinemc-server/paper-patches/files/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java.patch similarity index 68% rename from divinemc-server/paper-patches/features/0012-Skip-event-if-no-listeners.patch rename to divinemc-server/paper-patches/files/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java.patch index 6cf7bfc..9138b72 100644 --- a/divinemc-server/paper-patches/features/0012-Skip-event-if-no-listeners.patch +++ b/divinemc-server/paper-patches/files/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java.patch @@ -1,14 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Mon, 7 Jul 2025 04:04:20 +0300 -Subject: [PATCH] Skip event if no listeners - - -diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java -index 11e5b9ebafa562e5a93643d954839e86d0b731f0..d7398b1ecf2660c29fb7d106b48fe02d3736603e 100644 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java -@@ -35,15 +35,16 @@ class PaperEventManager { +@@ -36,14 +_,15 @@ // SimplePluginManager public void callEvent(@NotNull Event event) { @@ -21,10 +13,9 @@ index 11e5b9ebafa562e5a93643d954839e86d0b731f0..d7398b1ecf2660c29fb7d106b48fe02d } else if (!event.isAsynchronous() && !this.server.isPrimaryThread() && !this.server.isStopping()) { throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously."); } - +- - HandlerList handlers = event.getHandlers(); - RegisteredListener[] listeners = handlers.getRegisteredListeners(); -- + for (RegisteredListener registration : listeners) { if (!registration.getPlugin().isEnabled()) { - continue; diff --git a/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch b/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch new file mode 100644 index 0000000..2c9b388 --- /dev/null +++ b/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch @@ -0,0 +1,11 @@ +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -974,7 +_,7 @@ + + @Override + public List getWorlds() { +- return new ArrayList(this.worlds.values()); ++ return new it.unimi.dsi.fastutil.objects.ObjectArrayList(this.worlds.values()); // DivineMC - Replace CraftServer#getWorlds ArrayList with a fastutil ObjectArrayList + } + + @Override diff --git a/divinemc-server/paper-patches/features/0013-Force-Minecraft-command.patch b/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java.patch similarity index 61% rename from divinemc-server/paper-patches/features/0013-Force-Minecraft-command.patch rename to divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java.patch index c3c3276..b7b1a06 100644 --- a/divinemc-server/paper-patches/features/0013-Force-Minecraft-command.patch +++ b/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java.patch @@ -1,14 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Mon, 7 Jul 2025 04:05:08 +0300 -Subject: [PATCH] Force Minecraft command - - -diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java b/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java -index 90ed57a7fbcd0625b64084347460e9864216f610..138f37bf12f39152af97b14515007e9ca485967f 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java -@@ -14,4 +14,18 @@ public class CraftCommandMap extends SimpleCommandMap { +@@ -14,4 +_,18 @@ public Map getKnownCommands() { return this.knownCommands; }