diff --git a/divinemc-server/minecraft-patches/features/0007-Multithreaded-Tracker.patch b/divinemc-server/minecraft-patches/features/0006-Multithreaded-Tracker.patch similarity index 96% rename from divinemc-server/minecraft-patches/features/0007-Multithreaded-Tracker.patch rename to divinemc-server/minecraft-patches/features/0006-Multithreaded-Tracker.patch index e2f1eb6..a3e9ee3 100644 --- a/divinemc-server/minecraft-patches/features/0007-Multithreaded-Tracker.patch +++ b/divinemc-server/minecraft-patches/features/0006-Multithreaded-Tracker.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Multithreaded Tracker diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java b/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java -index 8ffe79b81777015ff807538e461ec68463225557..b28083be4384d6c5efbdce898a0e9d7a2f5bd3d3 100644 +index dd2509996bfd08e8c3f9f2be042229eac6d7692d..8ef5a1aaac9c27873ce746eb281f77bb318a3c69 100644 --- a/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java +++ b/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java @@ -342,7 +342,11 @@ public final class RegionizedPlayerChunkLoader { @@ -22,10 +22,10 @@ index 8ffe79b81777015ff807538e461ec68463225557..b28083be4384d6c5efbdce898a0e9d7a private static final byte CHUNK_TICKET_STAGE_NONE = 0; private static final byte CHUNK_TICKET_STAGE_LOADING = 1; diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java -index 72f019e3034d3268cf5526237ff0927eccc0c5bb..34c37abfe6c33ca1073450c8925f553d34be87a0 100644 +index d3d9926d504fa6b3384be5ae06b2843ebb7f807c..1d73154786e2ad4c1e9b307dfba43dd6ae008e2a 100644 --- a/net/minecraft/server/level/ChunkMap.java +++ b/net/minecraft/server/level/ChunkMap.java -@@ -262,9 +262,19 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -248,9 +248,19 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } final ServerPlayer[] backingSet = inRange.getRawDataUnchecked(); @@ -47,7 +47,7 @@ index 72f019e3034d3268cf5526237ff0927eccc0c5bb..34c37abfe6c33ca1073450c8925f553d } // Paper start - per player mob count backoff -@@ -965,6 +975,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -951,6 +961,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider // Paper end - optimise entity tracker protected void tick() { @@ -61,7 +61,7 @@ index 72f019e3034d3268cf5526237ff0927eccc0c5bb..34c37abfe6c33ca1073450c8925f553d // Paper start - optimise entity tracker if (true) { this.newTrackerTick(); -@@ -1087,7 +1104,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1073,7 +1090,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider final Entity entity; private final int range; SectionPos lastSectionPos; @@ -74,7 +74,7 @@ index 72f019e3034d3268cf5526237ff0927eccc0c5bb..34c37abfe6c33ca1073450c8925f553d // Paper start - optimise entity tracker private long lastChunkUpdate = -1L; -@@ -1114,21 +1135,55 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1100,21 +1121,55 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider this.lastTrackedChunk = chunk; final ServerPlayer[] playersRaw = players.getRawDataUnchecked(); @@ -140,7 +140,7 @@ index 72f019e3034d3268cf5526237ff0927eccc0c5bb..34c37abfe6c33ca1073450c8925f553d } @Override -@@ -1190,7 +1245,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1176,7 +1231,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } public void broadcast(Packet packet) { @@ -149,7 +149,7 @@ index 72f019e3034d3268cf5526237ff0927eccc0c5bb..34c37abfe6c33ca1073450c8925f553d serverPlayerConnection.send(packet); } } -@@ -1203,21 +1258,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1189,21 +1244,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } public void broadcastRemoved() { @@ -243,7 +243,7 @@ index 9afd448ede87c9192dc576f66e08676a68b34d98..6e1ed33463c6280159d7f8187b9a9210 } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 420c9993df062466b85d60fe3fcc915e24d3da2a..19c7802969aa9d1e15b4c67ee5c97e73daf0a460 100644 +index 56a22d19a82a937c08cb4527b0f67f219a6bb8a0..f8c76bb2c9fa625e191036dc58ef3dfb1d4ee930 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1822,7 +1822,7 @@ public class ServerGamePacketListenerImpl diff --git a/divinemc-server/minecraft-patches/features/0006-Threaded-light-engine.patch b/divinemc-server/minecraft-patches/features/0006-Threaded-light-engine.patch deleted file mode 100644 index 612fc65..0000000 --- a/divinemc-server/minecraft-patches/features/0006-Threaded-light-engine.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> -Date: Tue, 28 Jan 2025 01:14:58 +0300 -Subject: [PATCH] Threaded light engine - - -diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java -index d3d9926d504fa6b3384be5ae06b2843ebb7f807c..72f019e3034d3268cf5526237ff0927eccc0c5bb 100644 ---- a/net/minecraft/server/level/ChunkMap.java -+++ b/net/minecraft/server/level/ChunkMap.java -@@ -210,7 +210,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider - ConsecutiveExecutor consecutiveExecutor = new ConsecutiveExecutor(dispatcher, "worldgen"); - this.progressListener = progressListener; - this.chunkStatusListener = chunkStatusListener; -- ConsecutiveExecutor consecutiveExecutor1 = new ConsecutiveExecutor(dispatcher, "light"); -+ ConsecutiveExecutor consecutiveExecutor1 = onLightExecutorInit(ConsecutiveExecutor::new); // DivineMC - Threaded light engine - // Paper - rewrite chunk system - this.lightEngine = new ThreadedLevelLightEngine( - lightChunk, this, this.level.dimensionType().hasSkyLight(), consecutiveExecutor1, null // Paper - rewrite chunk system -@@ -230,6 +230,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider - this.worldGenContext = new WorldGenContext(level, generator, structureManager, this.lightEngine, null, this::setChunkUnsaved); // Paper - rewrite chunk system - } - -+ // DivineMC start - Threaded light engine -+ private java.util.concurrent.ExecutorService lightThread = null; -+ -+ private ConsecutiveExecutor onLightExecutorInit(java.util.function.BiFunction original) { -+ lightThread = new java.util.concurrent.ThreadPoolExecutor( -+ 1, 1, -+ 0, java.util.concurrent.TimeUnit.SECONDS, -+ new java.util.concurrent.LinkedBlockingQueue<>(), -+ new com.google.common.util.concurrent.ThreadFactoryBuilder().setPriority(Thread.NORM_PRIORITY - 1).setDaemon(true).setNameFormat(String.format("%s - Light", level.dimension().location().toDebugFileName())).build() -+ ); -+ return original.apply(lightThread, "light"); -+ } -+ // DivineMC end - Threaded light engine -+ - private void setChunkUnsaved(ChunkPos chunkPos) { - // Paper - rewrite chunk system - } diff --git a/divinemc-server/minecraft-patches/features/0008-Async-locate-command.patch b/divinemc-server/minecraft-patches/features/0007-Async-locate-command.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0008-Async-locate-command.patch rename to divinemc-server/minecraft-patches/features/0007-Async-locate-command.patch diff --git a/divinemc-server/minecraft-patches/features/0009-Parallel-world-ticking.patch b/divinemc-server/minecraft-patches/features/0008-Parallel-world-ticking.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0009-Parallel-world-ticking.patch rename to divinemc-server/minecraft-patches/features/0008-Parallel-world-ticking.patch diff --git a/divinemc-server/minecraft-patches/features/0010-Misc-Optimizations.patch b/divinemc-server/minecraft-patches/features/0009-Misc-Optimizations.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0010-Misc-Optimizations.patch rename to divinemc-server/minecraft-patches/features/0009-Misc-Optimizations.patch diff --git a/divinemc-server/minecraft-patches/features/0011-Chunk-System-Optimizations.patch b/divinemc-server/minecraft-patches/features/0010-Chunk-System-Optimizations.patch similarity index 99% rename from divinemc-server/minecraft-patches/features/0011-Chunk-System-Optimizations.patch rename to divinemc-server/minecraft-patches/features/0010-Chunk-System-Optimizations.patch index ae2a61c..f6adf3c 100644 --- a/divinemc-server/minecraft-patches/features/0011-Chunk-System-Optimizations.patch +++ b/divinemc-server/minecraft-patches/features/0010-Chunk-System-Optimizations.patch @@ -950,6 +950,39 @@ index 460bb584db04b582f3297ae419183f430aff1ec0..72c4e1876115745fbeec12fe8a1ad6f4 public static void registerPaperCommands(final Map, PaperSubcommand> commands) { commands.put(Set.of("fixlight"), new FixLightCommand()); // Paper - rewrite chunk system commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand()); // Paper - rewrite chunk system +diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java +index 1d73154786e2ad4c1e9b307dfba43dd6ae008e2a..683a0296fd8b22a9a4a0268075df4f90759e5e8c 100644 +--- a/net/minecraft/server/level/ChunkMap.java ++++ b/net/minecraft/server/level/ChunkMap.java +@@ -730,27 +730,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider + return false; + } + +- final ServerPlayer[] raw = players.getRawDataUnchecked(); +- final int len = players.size(); +- +- Objects.checkFromIndexSize(0, len, raw.length); +- for (int i = 0; i < len; ++i) { +- final ServerPlayer serverPlayer = raw[i]; +- // Paper start - PlayerNaturallySpawnCreaturesEvent +- com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent event; +- blockRange = 16384.0D; +- if (reducedRange) { +- event = serverPlayer.playerNaturallySpawnedEvent; +- if (event == null || event.isCancelled()) continue; +- blockRange = (double) ((event.getSpawnRadius() << 4) * (event.getSpawnRadius() << 4)); +- } +- // Paper end - PlayerNaturallySpawnCreaturesEvent +- if (this.playerIsCloseEnoughForSpawning(serverPlayer, chunkPos, blockRange)) { +- return true; +- } +- } +- +- return false; ++ return !players.isEmpty(); // DivineMC - Chunk System Optimizations + // Paper end - chunk tick iteration optimisation + } + diff --git a/net/minecraft/server/level/DistanceManager.java b/net/minecraft/server/level/DistanceManager.java index 5eab6179ce3913cb4e4d424f910ba423faf21c85..4b1efd53e423bdfe90d5efd472823869fc87e73b 100644 --- a/net/minecraft/server/level/DistanceManager.java diff --git a/divinemc-server/minecraft-patches/features/0012-Optimize-hoppers.patch b/divinemc-server/minecraft-patches/features/0011-Optimize-hoppers.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0012-Optimize-hoppers.patch rename to divinemc-server/minecraft-patches/features/0011-Optimize-hoppers.patch diff --git a/divinemc-server/minecraft-patches/features/0013-Optimize-Fluids.patch b/divinemc-server/minecraft-patches/features/0012-Optimize-Fluids.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0013-Optimize-Fluids.patch rename to divinemc-server/minecraft-patches/features/0012-Optimize-Fluids.patch diff --git a/divinemc-server/minecraft-patches/features/0014-Optimize-entity-stupid-brain.patch b/divinemc-server/minecraft-patches/features/0013-Optimize-entity-stupid-brain.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0014-Optimize-entity-stupid-brain.patch rename to divinemc-server/minecraft-patches/features/0013-Optimize-entity-stupid-brain.patch diff --git a/divinemc-server/minecraft-patches/features/0015-Clump-experience-orbs.patch b/divinemc-server/minecraft-patches/features/0014-Clump-experience-orbs.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0015-Clump-experience-orbs.patch rename to divinemc-server/minecraft-patches/features/0014-Clump-experience-orbs.patch diff --git a/divinemc-server/minecraft-patches/features/0016-Optimize-explosions.patch b/divinemc-server/minecraft-patches/features/0015-Optimize-explosions.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0016-Optimize-explosions.patch rename to divinemc-server/minecraft-patches/features/0015-Optimize-explosions.patch diff --git a/divinemc-server/minecraft-patches/features/0017-Option-to-allow-weird-movement-and-disable-teleporti.patch b/divinemc-server/minecraft-patches/features/0016-Option-to-allow-weird-movement-and-disable-teleporti.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0017-Option-to-allow-weird-movement-and-disable-teleporti.patch rename to divinemc-server/minecraft-patches/features/0016-Option-to-allow-weird-movement-and-disable-teleporti.patch diff --git a/divinemc-server/minecraft-patches/features/0018-Lag-compensation.patch b/divinemc-server/minecraft-patches/features/0017-Lag-compensation.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0018-Lag-compensation.patch rename to divinemc-server/minecraft-patches/features/0017-Lag-compensation.patch diff --git a/divinemc-server/minecraft-patches/features/0019-MSPT-Tracking-for-each-world.patch b/divinemc-server/minecraft-patches/features/0018-MSPT-Tracking-for-each-world.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0019-MSPT-Tracking-for-each-world.patch rename to divinemc-server/minecraft-patches/features/0018-MSPT-Tracking-for-each-world.patch diff --git a/divinemc-server/minecraft-patches/features/0020-Skip-EntityScheduler-s-executeTick-checks-if-there-i.patch b/divinemc-server/minecraft-patches/features/0019-Skip-EntityScheduler-s-executeTick-checks-if-there-i.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0020-Skip-EntityScheduler-s-executeTick-checks-if-there-i.patch rename to divinemc-server/minecraft-patches/features/0019-Skip-EntityScheduler-s-executeTick-checks-if-there-i.patch diff --git a/divinemc-server/minecraft-patches/features/0021-Carpet-Fixes-RecipeManager-Optimize.patch b/divinemc-server/minecraft-patches/features/0020-Carpet-Fixes-RecipeManager-Optimize.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0021-Carpet-Fixes-RecipeManager-Optimize.patch rename to divinemc-server/minecraft-patches/features/0020-Carpet-Fixes-RecipeManager-Optimize.patch diff --git a/divinemc-server/minecraft-patches/features/0022-Snowball-and-Egg-knockback.patch b/divinemc-server/minecraft-patches/features/0021-Snowball-and-Egg-knockback.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0022-Snowball-and-Egg-knockback.patch rename to divinemc-server/minecraft-patches/features/0021-Snowball-and-Egg-knockback.patch diff --git a/divinemc-server/minecraft-patches/features/0023-Block-Log4Shell-exploit.patch b/divinemc-server/minecraft-patches/features/0022-Block-Log4Shell-exploit.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0023-Block-Log4Shell-exploit.patch rename to divinemc-server/minecraft-patches/features/0022-Block-Log4Shell-exploit.patch diff --git a/divinemc-server/minecraft-patches/features/0024-Re-Fix-MC-117075.patch b/divinemc-server/minecraft-patches/features/0023-Re-Fix-MC-117075.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0024-Re-Fix-MC-117075.patch rename to divinemc-server/minecraft-patches/features/0023-Re-Fix-MC-117075.patch diff --git a/divinemc-server/minecraft-patches/features/0025-Skip-distanceToSqr-call-in-ServerEntity-sendChanges-.patch b/divinemc-server/minecraft-patches/features/0024-Skip-distanceToSqr-call-in-ServerEntity-sendChanges-.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0025-Skip-distanceToSqr-call-in-ServerEntity-sendChanges-.patch rename to divinemc-server/minecraft-patches/features/0024-Skip-distanceToSqr-call-in-ServerEntity-sendChanges-.patch diff --git a/divinemc-server/minecraft-patches/features/0026-Optimize-canSee-checks.patch b/divinemc-server/minecraft-patches/features/0025-Optimize-canSee-checks.patch similarity index 87% rename from divinemc-server/minecraft-patches/features/0026-Optimize-canSee-checks.patch rename to divinemc-server/minecraft-patches/features/0025-Optimize-canSee-checks.patch index e509d00..b806627 100644 --- a/divinemc-server/minecraft-patches/features/0026-Optimize-canSee-checks.patch +++ b/divinemc-server/minecraft-patches/features/0025-Optimize-canSee-checks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Optimize canSee checks diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java -index 34c37abfe6c33ca1073450c8925f553d34be87a0..5f754dedc2fcbcc67b20c7069b8c5fccd68a7361 100644 +index 683a0296fd8b22a9a4a0268075df4f90759e5e8c..65f67bac8ebe2bacd48384675805abb7edd57c6c 100644 --- a/net/minecraft/server/level/ChunkMap.java +++ b/net/minecraft/server/level/ChunkMap.java -@@ -1293,7 +1293,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1259,7 +1259,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider flag = flag && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z); // Paper end - Configurable entity tracking range by Y // CraftBukkit start - respect vanish API diff --git a/divinemc-server/minecraft-patches/features/0027-Implement-NoChatReports.patch b/divinemc-server/minecraft-patches/features/0026-Implement-NoChatReports.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0027-Implement-NoChatReports.patch rename to divinemc-server/minecraft-patches/features/0026-Implement-NoChatReports.patch diff --git a/divinemc-server/minecraft-patches/features/0028-Optimize-Structure-Generation.patch b/divinemc-server/minecraft-patches/features/0027-Optimize-Structure-Generation.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0028-Optimize-Structure-Generation.patch rename to divinemc-server/minecraft-patches/features/0027-Optimize-Structure-Generation.patch diff --git a/divinemc-server/minecraft-patches/features/0029-Verify-Minecraft-EULA-earlier.patch b/divinemc-server/minecraft-patches/features/0028-Verify-Minecraft-EULA-earlier.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0029-Verify-Minecraft-EULA-earlier.patch rename to divinemc-server/minecraft-patches/features/0028-Verify-Minecraft-EULA-earlier.patch diff --git a/divinemc-server/minecraft-patches/features/0030-Configurable-MC-67.patch b/divinemc-server/minecraft-patches/features/0029-Configurable-MC-67.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0030-Configurable-MC-67.patch rename to divinemc-server/minecraft-patches/features/0029-Configurable-MC-67.patch diff --git a/divinemc-server/minecraft-patches/features/0031-Option-to-disable-saving-of-snowball-and-firework.patch b/divinemc-server/minecraft-patches/features/0030-Option-to-disable-saving-of-snowball-and-firework.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0031-Option-to-disable-saving-of-snowball-and-firework.patch rename to divinemc-server/minecraft-patches/features/0030-Option-to-disable-saving-of-snowball-and-firework.patch diff --git a/divinemc-server/minecraft-patches/features/0032-Catch-update-suppressors.patch b/divinemc-server/minecraft-patches/features/0031-Catch-update-suppressors.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0032-Catch-update-suppressors.patch rename to divinemc-server/minecraft-patches/features/0031-Catch-update-suppressors.patch diff --git a/divinemc-server/minecraft-patches/features/0033-lithium-fast_util.patch b/divinemc-server/minecraft-patches/features/0032-lithium-fast_util.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0033-lithium-fast_util.patch rename to divinemc-server/minecraft-patches/features/0032-lithium-fast_util.patch diff --git a/divinemc-server/minecraft-patches/features/0034-Virtual-Threads.patch b/divinemc-server/minecraft-patches/features/0033-Virtual-Threads.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0034-Virtual-Threads.patch rename to divinemc-server/minecraft-patches/features/0033-Virtual-Threads.patch diff --git a/divinemc-server/minecraft-patches/features/0035-Regionized-Chunk-Ticking.patch b/divinemc-server/minecraft-patches/features/0034-Regionized-Chunk-Ticking.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0035-Regionized-Chunk-Ticking.patch rename to divinemc-server/minecraft-patches/features/0034-Regionized-Chunk-Ticking.patch diff --git a/divinemc-server/minecraft-patches/features/0036-Async-Chunk-Sending.patch b/divinemc-server/minecraft-patches/features/0035-Async-Chunk-Sending.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0036-Async-Chunk-Sending.patch rename to divinemc-server/minecraft-patches/features/0035-Async-Chunk-Sending.patch diff --git a/divinemc-server/minecraft-patches/features/0037-Option-to-disable-disconnect.spam.patch b/divinemc-server/minecraft-patches/features/0036-Option-to-disable-disconnect.spam.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0037-Option-to-disable-disconnect.spam.patch rename to divinemc-server/minecraft-patches/features/0036-Option-to-disable-disconnect.spam.patch diff --git a/divinemc-server/minecraft-patches/features/0038-Configurable-MC-59471.patch b/divinemc-server/minecraft-patches/features/0037-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/0037-Configurable-MC-59471.patch diff --git a/divinemc-server/minecraft-patches/features/0039-ModernFix-compact_bit_storage.patch b/divinemc-server/minecraft-patches/features/0038-ModernFix-compact_bit_storage.patch similarity index 95% rename from divinemc-server/minecraft-patches/features/0039-ModernFix-compact_bit_storage.patch rename to divinemc-server/minecraft-patches/features/0038-ModernFix-compact_bit_storage.patch index a49cfcb..e0e5e34 100644 --- a/divinemc-server/minecraft-patches/features/0039-ModernFix-compact_bit_storage.patch +++ b/divinemc-server/minecraft-patches/features/0038-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 ea870afe24eb33a1333a32a42df5277155501ebc..450c119dcef10bcc2c0ef044aaed8760050c78db 100644 +index 712d3d1669aecd38934957c81835e1f38289539a..810e61913aece5a8158f83b6dd56a7b6cb083c19 100644 --- a/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/net/minecraft/world/level/chunk/PalettedContainer.java @@ -275,6 +275,28 @@ public class PalettedContainer implements PaletteResize, PalettedContainer diff --git a/divinemc-server/minecraft-patches/features/0040-Command-block-parse-results-caching.patch b/divinemc-server/minecraft-patches/features/0039-Command-block-parse-results-caching.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0040-Command-block-parse-results-caching.patch rename to divinemc-server/minecraft-patches/features/0039-Command-block-parse-results-caching.patch diff --git a/divinemc-server/minecraft-patches/features/0041-Linear-region-file-format.patch b/divinemc-server/minecraft-patches/features/0040-Linear-region-file-format.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0041-Linear-region-file-format.patch rename to divinemc-server/minecraft-patches/features/0040-Linear-region-file-format.patch diff --git a/divinemc-server/minecraft-patches/features/0042-Async-mob-spawning.patch b/divinemc-server/minecraft-patches/features/0041-Async-mob-spawning.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0042-Async-mob-spawning.patch rename to divinemc-server/minecraft-patches/features/0041-Async-mob-spawning.patch diff --git a/divinemc-server/minecraft-patches/features/0043-Dynamic-Activation-of-Brain.patch b/divinemc-server/minecraft-patches/features/0042-Dynamic-Activation-of-Brain.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0043-Dynamic-Activation-of-Brain.patch rename to divinemc-server/minecraft-patches/features/0042-Dynamic-Activation-of-Brain.patch diff --git a/divinemc-server/minecraft-patches/features/0044-Configurable-movement-speed-for-entities.patch b/divinemc-server/minecraft-patches/features/0043-Configurable-movement-speed-for-entities.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0044-Configurable-movement-speed-for-entities.patch rename to divinemc-server/minecraft-patches/features/0043-Configurable-movement-speed-for-entities.patch diff --git a/divinemc-server/minecraft-patches/features/0045-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch b/divinemc-server/minecraft-patches/features/0044-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0045-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch rename to divinemc-server/minecraft-patches/features/0044-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch diff --git a/divinemc-server/minecraft-patches/features/0046-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch b/divinemc-server/minecraft-patches/features/0045-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0046-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch rename to divinemc-server/minecraft-patches/features/0045-Leaf-Improve-BlockEntity-ticking-isRemoved-check.patch diff --git a/divinemc-server/minecraft-patches/features/0047-Paper-PR-Throttle-failed-spawn-attempts.patch b/divinemc-server/minecraft-patches/features/0046-Paper-PR-Throttle-failed-spawn-attempts.patch similarity index 100% rename from divinemc-server/minecraft-patches/features/0047-Paper-PR-Throttle-failed-spawn-attempts.patch rename to divinemc-server/minecraft-patches/features/0046-Paper-PR-Throttle-failed-spawn-attempts.patch