diff --git a/patches/server/0014-Fix-MC-183518.patch b/patches/server/0014-Fix-MC-183518.patch new file mode 100644 index 0000000..85c788a --- /dev/null +++ b/patches/server/0014-Fix-MC-183518.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> +Date: Mon, 17 Jun 2024 17:15:13 +0300 +Subject: [PATCH] Fix MC-183518 + +Issue on Mojira: https://bugs.mojang.com/browse/MC-183518 +P.S. Btw, I took this fix from this PR - https://github.com/Winds-Studio/Leaf/pull/69 + +diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java +index 2510589400b3012b827efcab477c6483d9d55901..e64af5ac326786d006adf1ad6d31254cfddebcb1 100644 +--- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java ++++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java +@@ -142,8 +142,7 @@ public abstract class BlockableEventLoop implements Profiler + } + + public void waitForTasks() { +- Thread.yield(); +- LockSupport.parkNanos("waiting for tasks", 100000L); ++ LockSupport.parkNanos("waiting for tasks", 2000000L); // DivineMC - Fix MC-183518 + } + + protected void doRunTask(R task) { diff --git a/patches/server/0014-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0014-vmp-skip-entity-move-if-movement-is-zero.patch rename to patches/server/0015-vmp-skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0015-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch b/patches/server/0016-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch similarity index 100% rename from patches/server/0015-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch rename to patches/server/0016-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch diff --git a/patches/server/0016-lithium-ai.raid.patch b/patches/server/0017-lithium-ai.raid.patch similarity index 100% rename from patches/server/0016-lithium-ai.raid.patch rename to patches/server/0017-lithium-ai.raid.patch diff --git a/patches/server/0017-lithium-collections.gamerules.patch b/patches/server/0018-lithium-collections.gamerules.patch similarity index 100% rename from patches/server/0017-lithium-collections.gamerules.patch rename to patches/server/0018-lithium-collections.gamerules.patch diff --git a/patches/server/0018-lithium-collections.entity_by_type.patch b/patches/server/0019-lithium-collections.entity_by_type.patch similarity index 100% rename from patches/server/0018-lithium-collections.entity_by_type.patch rename to patches/server/0019-lithium-collections.entity_by_type.patch diff --git a/patches/server/0019-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch b/patches/server/0020-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch similarity index 100% rename from patches/server/0019-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch rename to patches/server/0020-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch diff --git a/patches/server/0020-lithium-precompute-shape-arrays.patch b/patches/server/0021-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0020-lithium-precompute-shape-arrays.patch rename to patches/server/0021-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0021-vmp-spawn_density_cap.patch b/patches/server/0022-vmp-spawn_density_cap.patch similarity index 100% rename from patches/server/0021-vmp-spawn_density_cap.patch rename to patches/server/0022-vmp-spawn_density_cap.patch diff --git a/patches/server/0022-lithium-cached_hashcode.patch b/patches/server/0023-lithium-cached_hashcode.patch similarity index 100% rename from patches/server/0022-lithium-cached_hashcode.patch rename to patches/server/0023-lithium-cached_hashcode.patch diff --git a/patches/server/0023-lithium-math.sine_lut.patch b/patches/server/0024-lithium-math.sine_lut.patch similarity index 100% rename from patches/server/0023-lithium-math.sine_lut.patch rename to patches/server/0024-lithium-math.sine_lut.patch diff --git a/patches/server/0024-Don-t-save-Fireworks.patch b/patches/server/0025-Don-t-save-Fireworks.patch similarity index 100% rename from patches/server/0024-Don-t-save-Fireworks.patch rename to patches/server/0025-Don-t-save-Fireworks.patch diff --git a/patches/server/0025-Remove-Spigot-tick-limiter.patch b/patches/server/0026-Remove-Spigot-tick-limiter.patch similarity index 100% rename from patches/server/0025-Remove-Spigot-tick-limiter.patch rename to patches/server/0026-Remove-Spigot-tick-limiter.patch diff --git a/patches/server/0026-Make-entity-goals-public.patch b/patches/server/0027-Make-entity-goals-public.patch similarity index 100% rename from patches/server/0026-Make-entity-goals-public.patch rename to patches/server/0027-Make-entity-goals-public.patch diff --git a/patches/server/0027-Optimize-Paper-Event-Manager.patch b/patches/server/0028-Optimize-Paper-Event-Manager.patch similarity index 100% rename from patches/server/0027-Optimize-Paper-Event-Manager.patch rename to patches/server/0028-Optimize-Paper-Event-Manager.patch diff --git a/patches/server/0028-Delete-Timings.patch b/patches/server/0029-Delete-Timings.patch similarity index 77% rename from patches/server/0028-Delete-Timings.patch rename to patches/server/0029-Delete-Timings.patch index b5932d2..4add33a 100644 --- a/patches/server/0028-Delete-Timings.patch +++ b/patches/server/0029-Delete-Timings.patch @@ -4,6 +4,190 @@ Date: Sun, 12 May 2024 20:58:42 +0300 Subject: [PATCH] Delete Timings +diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java +deleted file mode 100644 +index 6b3cde6d4d1e63bec01f502f2027ee9fddac08aa..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/MinecraftTimings.java ++++ /dev/null +@@ -1,178 +0,0 @@ +-package co.aikar.timings; +- +-import com.google.common.collect.MapMaker; +-import io.papermc.paper.configuration.GlobalConfiguration; +-import net.minecraft.commands.functions.CommandFunction; +-import net.minecraft.network.protocol.Packet; +-import net.minecraft.world.level.block.Block; +-import net.minecraft.world.level.block.entity.BlockEntity; +-import org.bukkit.plugin.Plugin; +-import org.bukkit.scheduler.BukkitTask; +- +-import org.bukkit.craftbukkit.scheduler.CraftTask; +- +-import java.util.Map; +- +-// TODO: Re-implement missing timers +-@Deprecated(forRemoval = true) +-public final class MinecraftTimings { +- +- public static final Timing serverOversleep = Timings.ofSafe("Server Oversleep"); +- public static final Timing playerListTimer = Timings.ofSafe("Player List"); +- public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions"); +- public static final Timing connectionTimer = Timings.ofSafe("Connection Handler"); +- public static final Timing tickablesTimer = Timings.ofSafe("Tickables"); +- public static final Timing minecraftSchedulerTimer = Timings.ofSafe("Minecraft Scheduler"); +- public static final Timing bukkitSchedulerTimer = Timings.ofSafe("Bukkit Scheduler"); +- public static final Timing bukkitSchedulerPendingTimer = Timings.ofSafe("Bukkit Scheduler - Pending"); +- public static final Timing bukkitSchedulerFinishTimer = Timings.ofSafe("Bukkit Scheduler - Finishing"); +- public static final Timing chunkIOTickTimer = Timings.ofSafe("ChunkIOTick"); +- public static final Timing timeUpdateTimer = Timings.ofSafe("Time Update"); +- public static final Timing serverCommandTimer = Timings.ofSafe("Server Command"); +- public static final Timing savePlayers = Timings.ofSafe("Save Players"); +- +- public static final Timing tickEntityTimer = Timings.ofSafe("## tickEntity"); +- public static final Timing tickTileEntityTimer = Timings.ofSafe("## tickTileEntity"); +- public static final Timing packetProcessTimer = Timings.ofSafe("## Packet Processing"); +- public static final Timing scheduledBlocksTimer = Timings.ofSafe("## Scheduled Blocks"); +- public static final Timing structureGenerationTimer = Timings.ofSafe("Structure Generation"); +- +- public static final Timing processQueueTimer = Timings.ofSafe("processQueue"); +- public static final Timing processTasksTimer = Timings.ofSafe("processTasks"); +- +- public static final Timing playerCommandTimer = Timings.ofSafe("playerCommand"); +- +- public static final Timing entityActivationCheckTimer = Timings.ofSafe("entityActivationCheck"); +- +- public static final Timing antiXrayUpdateTimer = Timings.ofSafe("anti-xray - update"); +- public static final Timing antiXrayObfuscateTimer = Timings.ofSafe("anti-xray - obfuscate"); +- public static final Timing scoreboardScoreSearch = Timings.ofSafe("Scoreboard score search"); // Paper - add timings for scoreboard search +- +- private static final Map, String> taskNameCache = new MapMaker().weakKeys().makeMap(); +- +- private MinecraftTimings() {} +- +- public static Timing getInternalTaskName(String taskName) { +- return Timings.ofSafe(taskName); +- } +- +- /** +- * Gets a timer associated with a plugins tasks. +- * @param bukkitTask +- * @param period +- * @return +- */ +- public static Timing getPluginTaskTimings(BukkitTask bukkitTask, long period) { +- if (!bukkitTask.isSync()) { +- return NullTimingHandler.NULL; +- } +- Plugin plugin; +- +- CraftTask craftTask = (CraftTask) bukkitTask; +- +- final Class taskClass = craftTask.getTaskClass(); +- if (bukkitTask.getOwner() != null) { +- plugin = bukkitTask.getOwner(); +- } else { +- plugin = TimingsManager.getPluginByClassloader(taskClass); +- } +- +- final String taskname = taskNameCache.computeIfAbsent(taskClass, clazz -> { +- try { +- String clsName = !clazz.isMemberClass() +- ? clazz.getName() +- : clazz.getCanonicalName(); +- if (clsName != null && clsName.contains("$Lambda$")) { +- clsName = clsName.replaceAll("(Lambda\\$.*?)/.*", "$1"); +- } +- return clsName != null ? clsName : "UnknownTask"; +- } catch (Throwable ex) { +- new Exception("Error occurred detecting class name", ex).printStackTrace(); +- return "MangledClassFile"; +- } +- }); +- +- StringBuilder name = new StringBuilder(64); +- name.append("Task: ").append(taskname); +- if (period > 0) { +- name.append(" (interval:").append(period).append(")"); +- } else { +- name.append(" (Single)"); +- } +- +- if (plugin == null) { +- return Timings.ofSafe(null, name.toString()); +- } +- +- return Timings.ofSafe(plugin, name.toString()); +- } +- +- /** +- * Get a named timer for the specified entity type to track type specific timings. +- * @param entityType +- * @return +- */ +- public static Timing getEntityTimings(String entityType, String type) { +- return Timings.ofSafe("Minecraft", "## tickEntity - " + entityType + " - " + type, tickEntityTimer); +- } +- +- public static Timing getBehaviorTimings(String type) { +- return Timings.ofSafe("## Behavior - " + type); +- } +- +- public static Timing getSensorTimings(String type, int rate) { +- return Timings.ofSafe("## Sensor - " + type + " (Default rate: " + rate + ")"); +- } +- +- /** +- * Get a named timer for the specified tile entity type to track type specific timings. +- * @param entity +- * @return +- */ +- public static Timing getTileEntityTimings(BlockEntity entity) { +- String entityType = entity.getClass().getName(); +- return Timings.ofSafe("Minecraft", "## tickTileEntity - " + entityType, tickTileEntityTimer); +- } +- public static Timing getCancelTasksTimer() { +- return Timings.ofSafe("Cancel Tasks"); +- } +- public static Timing getCancelTasksTimer(Plugin plugin) { +- return Timings.ofSafe(plugin, "Cancel Tasks"); +- } +- +- public static void stopServer() { +- TimingsManager.stopServer(); +- } +- +- public static Timing getBlockTiming(Block block) { +- return Timings.ofSafe("## Scheduled Block: " + block.toString(), scheduledBlocksTimer); +- } +-/* +- public static Timing getStructureTiming(StructureGenerator structureGenerator) { +- return Timings.ofSafe("Structure Generator - " + structureGenerator.getName(), structureGenerationTimer); +- }*/ +- +- public static Timing getPacketTiming(Packet packet) { +- return Timings.ofSafe("## Packet - " + packet.getClass().getName(), packetProcessTimer); +- } +- +- public static Timing getCommandFunctionTiming(CommandFunction function) { +- return Timings.ofSafe("Command Function - " + function.id()); +- } +- +- public static void processConfig(GlobalConfiguration.Timings config) { +- TimingsManager.url = config.url; +- if (!TimingsManager.url.endsWith("/")) { +- TimingsManager.url += "/"; +- } +- TimingsManager.privacy = config.serverNamePrivacy; +- if (!config.hiddenConfigEntries.contains("proxies.velocity.secret")) { +- config.hiddenConfigEntries.add("proxies.velocity.secret"); +- } +- TimingsManager.hiddenConfigs.addAll(config.hiddenConfigEntries); +- co.aikar.timings.Timings.setVerboseTimingsEnabled(config.verbose); +- co.aikar.timings.Timings.setTimingsEnabled(config.enabled); +- co.aikar.timings.Timings.setHistoryInterval(config.historyInterval * 20); +- co.aikar.timings.Timings.setHistoryLength(config.historyLength * 20); +- } +-} diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java deleted file mode 100644 index 7620c72a4c243cbeea245203ce03a97cbfa7d922..0000000000000000000000000000000000000000 @@ -398,6 +582,132 @@ index 7620c72a4c243cbeea245203ce03a97cbfa7d922..00000000000000000000000000000000 - } - } -} +diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java +deleted file mode 100644 +index 2f0d9b953802dee821cfde82d22b0567cce8ee91..0000000000000000000000000000000000000000 +--- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java ++++ /dev/null +@@ -1,120 +0,0 @@ +-package co.aikar.timings; +- +-import net.minecraft.server.level.ServerLevel; +-import net.minecraft.world.level.Level; +-import net.minecraft.world.level.storage.PrimaryLevelData; +- +-/** +- * Set of timers per world, to track world specific timings. +- */ +-// TODO: Re-implement missing timers +-@Deprecated(forRemoval = true) +-public class WorldTimingsHandler { +- public final Timing mobSpawn; +- public final Timing doChunkUnload; +- public final Timing doPortalForcer; +- public final Timing scheduledBlocks; +- public final Timing scheduledBlocksCleanup; +- public final Timing scheduledBlocksTicking; +- public final Timing chunkTicks; +- public final Timing lightChunk; +- public final Timing chunkTicksBlocks; +- public final Timing doVillages; +- public final Timing doChunkMap; +- public final Timing doChunkMapUpdate; +- public final Timing doChunkMapToUpdate; +- public final Timing doChunkMapSortMissing; +- public final Timing doChunkMapSortSendToPlayers; +- public final Timing doChunkMapPlayersNeedingChunks; +- public final Timing doChunkMapPendingSendToPlayers; +- public final Timing doChunkMapUnloadChunks; +- public final Timing doChunkGC; +- public final Timing doSounds; +- public final Timing entityRemoval; +- public final Timing entityTick; +- public final Timing tileEntityTick; +- public final Timing tileEntityPending; +- public final Timing tracker1; +- public final Timing tracker2; +- public final Timing doTick; +- public final Timing tickEntities; +- public final Timing chunks; +- public final Timing newEntities; +- public final Timing raids; +- public final Timing chunkProviderTick; +- public final Timing broadcastChunkUpdates; +- public final Timing countNaturalMobs; +- +- public final Timing chunkLoad; +- public final Timing chunkLoadPopulate; +- public final Timing syncChunkLoad; +- public final Timing chunkLoadLevelTimer; +- public final Timing chunkIO; +- public final Timing chunkPostLoad; +- public final Timing worldSave; +- public final Timing worldSaveChunks; +- public final Timing worldSaveLevel; +- public final Timing chunkSaveData; +- +- +- public final Timing miscMobSpawning; +- +- public WorldTimingsHandler(Level server) { +- String name = ((PrimaryLevelData) server.getLevelData()).getLevelName() + " - "; +- +- mobSpawn = Timings.ofSafe(name + "mobSpawn"); +- doChunkUnload = Timings.ofSafe(name + "doChunkUnload"); +- scheduledBlocks = Timings.ofSafe(name + "Scheduled Blocks"); +- scheduledBlocksCleanup = Timings.ofSafe(name + "Scheduled Blocks - Cleanup"); +- scheduledBlocksTicking = Timings.ofSafe(name + "Scheduled Blocks - Ticking"); +- chunkTicks = Timings.ofSafe(name + "Chunk Ticks"); +- lightChunk = Timings.ofSafe(name + "Light Chunk"); +- chunkTicksBlocks = Timings.ofSafe(name + "Chunk Ticks - Blocks"); +- doVillages = Timings.ofSafe(name + "doVillages"); +- doChunkMap = Timings.ofSafe(name + "doChunkMap"); +- doChunkMapUpdate = Timings.ofSafe(name + "doChunkMap - Update"); +- doChunkMapToUpdate = Timings.ofSafe(name + "doChunkMap - To Update"); +- doChunkMapSortMissing = Timings.ofSafe(name + "doChunkMap - Sort Missing"); +- doChunkMapSortSendToPlayers = Timings.ofSafe(name + "doChunkMap - Sort Send To Players"); +- doChunkMapPlayersNeedingChunks = Timings.ofSafe(name + "doChunkMap - Players Needing Chunks"); +- doChunkMapPendingSendToPlayers = Timings.ofSafe(name + "doChunkMap - Pending Send To Players"); +- doChunkMapUnloadChunks = Timings.ofSafe(name + "doChunkMap - Unload Chunks"); +- doSounds = Timings.ofSafe(name + "doSounds"); +- doChunkGC = Timings.ofSafe(name + "doChunkGC"); +- doPortalForcer = Timings.ofSafe(name + "doPortalForcer"); +- entityTick = Timings.ofSafe(name + "entityTick"); +- entityRemoval = Timings.ofSafe(name + "entityRemoval"); +- tileEntityTick = Timings.ofSafe(name + "tileEntityTick"); +- tileEntityPending = Timings.ofSafe(name + "tileEntityPending"); +- +- chunkLoad = Timings.ofSafe(name + "Chunk Load"); +- chunkLoadPopulate = Timings.ofSafe(name + "Chunk Load - Populate"); +- syncChunkLoad = Timings.ofSafe(name + "Sync Chunk Load"); +- chunkLoadLevelTimer = Timings.ofSafe(name + "Chunk Load - Load Level"); +- chunkIO = Timings.ofSafe(name + "Chunk Load - DiskIO"); +- chunkPostLoad = Timings.ofSafe(name + "Chunk Load - Post Load"); +- worldSave = Timings.ofSafe(name + "World Save"); +- worldSaveLevel = Timings.ofSafe(name + "World Save - Level"); +- worldSaveChunks = Timings.ofSafe(name + "World Save - Chunks"); +- chunkSaveData = Timings.ofSafe(name + "Chunk Save - Data"); +- +- tracker1 = Timings.ofSafe(name + "tracker stage 1"); +- tracker2 = Timings.ofSafe(name + "tracker stage 2"); +- doTick = Timings.ofSafe(name + "doTick"); +- tickEntities = Timings.ofSafe(name + "tickEntities"); +- +- chunks = Timings.ofSafe(name + "Chunks"); +- newEntities = Timings.ofSafe(name + "New entity registration"); +- raids = Timings.ofSafe(name + "Raids"); +- chunkProviderTick = Timings.ofSafe(name + "Chunk provider tick"); +- broadcastChunkUpdates = Timings.ofSafe(name + "Broadcast chunk updates"); +- countNaturalMobs = Timings.ofSafe(name + "Count natural mobs"); +- +- +- miscMobSpawning = Timings.ofSafe(name + "Mob spawning - Misc"); +- } +- +- public static Timing getTickList(ServerLevel worldserver, String timingsType) { +- return Timings.ofSafe(((PrimaryLevelData) worldserver.getLevelData()).getLevelName() + " - Scheduled " + timingsType); +- } +-} diff --git a/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java b/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java index 24121a43aeb5e9bce013f30c92dddd15f99736c6..791cb04a13597eee4dbd28fabe2835ab41eb13f9 100644 --- a/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java diff --git a/patches/server/0029-Fix-sprint-glitch.patch b/patches/server/0030-Fix-sprint-glitch.patch similarity index 100% rename from patches/server/0029-Fix-sprint-glitch.patch rename to patches/server/0030-Fix-sprint-glitch.patch diff --git a/patches/server/0030-Boat-Settings.patch b/patches/server/0031-Boat-Settings.patch similarity index 100% rename from patches/server/0030-Boat-Settings.patch rename to patches/server/0031-Boat-Settings.patch diff --git a/patches/server/0031-Despawn-shulker-bullets-on-owner-death.patch b/patches/server/0032-Despawn-shulker-bullets-on-owner-death.patch similarity index 100% rename from patches/server/0031-Despawn-shulker-bullets-on-owner-death.patch rename to patches/server/0032-Despawn-shulker-bullets-on-owner-death.patch diff --git a/patches/server/0032-Reduce-sensor-work.patch b/patches/server/0033-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0032-Reduce-sensor-work.patch rename to patches/server/0033-Reduce-sensor-work.patch diff --git a/patches/server/0033-Snowball-and-Egg-knockback.patch b/patches/server/0034-Snowball-and-Egg-knockback.patch similarity index 100% rename from patches/server/0033-Snowball-and-Egg-knockback.patch rename to patches/server/0034-Snowball-and-Egg-knockback.patch diff --git a/patches/server/0034-Make-minecart-hopper-work-without-players.patch b/patches/server/0035-Make-minecart-hopper-work-without-players.patch similarity index 100% rename from patches/server/0034-Make-minecart-hopper-work-without-players.patch rename to patches/server/0035-Make-minecart-hopper-work-without-players.patch diff --git a/patches/server/0035-Fix-possible-NPE-during-creating-GUI-graph.patch b/patches/server/0036-Fix-possible-NPE-during-creating-GUI-graph.patch similarity index 100% rename from patches/server/0035-Fix-possible-NPE-during-creating-GUI-graph.patch rename to patches/server/0036-Fix-possible-NPE-during-creating-GUI-graph.patch diff --git a/patches/server/0036-Optimize-CraftServer.getWorld-UUID.patch b/patches/server/0037-Optimize-CraftServer.getWorld-UUID.patch similarity index 100% rename from patches/server/0036-Optimize-CraftServer.getWorld-UUID.patch rename to patches/server/0037-Optimize-CraftServer.getWorld-UUID.patch diff --git a/patches/server/0037-Block-Log4Shell-exploit.patch b/patches/server/0038-Block-Log4Shell-exploit.patch similarity index 100% rename from patches/server/0037-Block-Log4Shell-exploit.patch rename to patches/server/0038-Block-Log4Shell-exploit.patch diff --git a/patches/server/0038-Option-to-disable-non-editable-sign-warning.patch b/patches/server/0039-Option-to-disable-non-editable-sign-warning.patch similarity index 100% rename from patches/server/0038-Option-to-disable-non-editable-sign-warning.patch rename to patches/server/0039-Option-to-disable-non-editable-sign-warning.patch diff --git a/patches/server/0039-Suppress-errors-from-dirty-attributes.patch b/patches/server/0040-Suppress-errors-from-dirty-attributes.patch similarity index 100% rename from patches/server/0039-Suppress-errors-from-dirty-attributes.patch rename to patches/server/0040-Suppress-errors-from-dirty-attributes.patch diff --git a/patches/server/0040-Carpet-Fixes-RecipeManager-Optimize.patch b/patches/server/0041-Carpet-Fixes-RecipeManager-Optimize.patch similarity index 100% rename from patches/server/0040-Carpet-Fixes-RecipeManager-Optimize.patch rename to patches/server/0041-Carpet-Fixes-RecipeManager-Optimize.patch diff --git a/patches/server/0041-Carpet-Fixes-getBiome-Optimize.patch b/patches/server/0042-Carpet-Fixes-getBiome-Optimize.patch similarity index 100% rename from patches/server/0041-Carpet-Fixes-getBiome-Optimize.patch rename to patches/server/0042-Carpet-Fixes-getBiome-Optimize.patch diff --git a/patches/server/0042-C2ME-reduce_allocs.patch b/patches/server/0043-C2ME-reduce_allocs.patch similarity index 100% rename from patches/server/0042-C2ME-reduce_allocs.patch rename to patches/server/0043-C2ME-reduce_allocs.patch diff --git a/patches/server/0043-Carpet-AMS-Addition-Optimized-dragon-respawn.patch b/patches/server/0044-Carpet-AMS-Addition-Optimized-dragon-respawn.patch similarity index 100% rename from patches/server/0043-Carpet-AMS-Addition-Optimized-dragon-respawn.patch rename to patches/server/0044-Carpet-AMS-Addition-Optimized-dragon-respawn.patch diff --git a/patches/server/0044-C2ME-opts-math.patch b/patches/server/0045-C2ME-opts-math.patch similarity index 100% rename from patches/server/0044-C2ME-opts-math.patch rename to patches/server/0045-C2ME-opts-math.patch