diff --git a/patches/server/0103-Replace-Entity-active-effects-map-with-optimized-col.patch b/patches/server/0102-Replace-Entity-active-effects-map-with-optimized-col.patch similarity index 100% rename from patches/server/0103-Replace-Entity-active-effects-map-with-optimized-col.patch rename to patches/server/0102-Replace-Entity-active-effects-map-with-optimized-col.patch diff --git a/patches/server/0104-Replace-criterion-map-with-optimized-collection.patch b/patches/server/0103-Replace-criterion-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0104-Replace-criterion-map-with-optimized-collection.patch rename to patches/server/0103-Replace-criterion-map-with-optimized-collection.patch diff --git a/patches/server/0105-Replace-world-map-with-optimized-collection.patch b/patches/server/0104-Replace-world-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0105-Replace-world-map-with-optimized-collection.patch rename to patches/server/0104-Replace-world-map-with-optimized-collection.patch diff --git a/patches/server/0106-Replace-brain-maps-with-optimized-collection.patch b/patches/server/0105-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from patches/server/0106-Replace-brain-maps-with-optimized-collection.patch rename to patches/server/0105-Replace-brain-maps-with-optimized-collection.patch diff --git a/patches/server/0107-Reduce-worldgen-allocations.patch b/patches/server/0106-Reduce-worldgen-allocations.patch similarity index 100% rename from patches/server/0107-Reduce-worldgen-allocations.patch rename to patches/server/0106-Reduce-worldgen-allocations.patch diff --git a/patches/server/0108-Use-caffeine-cache-kickPermission-instead-of-using-g.patch b/patches/server/0107-Use-caffeine-cache-kickPermission-instead-of-using-g.patch similarity index 100% rename from patches/server/0108-Use-caffeine-cache-kickPermission-instead-of-using-g.patch rename to patches/server/0107-Use-caffeine-cache-kickPermission-instead-of-using-g.patch diff --git a/patches/server/0109-Do-not-place-player-if-the-server-is-full.patch b/patches/server/0108-Do-not-place-player-if-the-server-is-full.patch similarity index 100% rename from patches/server/0109-Do-not-place-player-if-the-server-is-full.patch rename to patches/server/0108-Do-not-place-player-if-the-server-is-full.patch diff --git a/patches/server/0110-Fix-MC-65198.patch b/patches/server/0109-Fix-MC-65198.patch similarity index 100% rename from patches/server/0110-Fix-MC-65198.patch rename to patches/server/0109-Fix-MC-65198.patch diff --git a/patches/server/0111-Fix-MC-183518.patch b/patches/server/0110-Fix-MC-183518.patch similarity index 100% rename from patches/server/0111-Fix-MC-183518.patch rename to patches/server/0110-Fix-MC-183518.patch diff --git a/patches/server/0112-Fix-MC-200418.patch b/patches/server/0111-Fix-MC-200418.patch similarity index 100% rename from patches/server/0112-Fix-MC-200418.patch rename to patches/server/0111-Fix-MC-200418.patch diff --git a/patches/server/0113-Fix-MC-119417.patch b/patches/server/0112-Fix-MC-119417.patch similarity index 100% rename from patches/server/0113-Fix-MC-119417.patch rename to patches/server/0112-Fix-MC-119417.patch diff --git a/patches/server/0114-Fix-MC-223153.patch b/patches/server/0113-Fix-MC-223153.patch similarity index 100% rename from patches/server/0114-Fix-MC-223153.patch rename to patches/server/0113-Fix-MC-223153.patch diff --git a/patches/server/0115-Fix-MC-177381.patch b/patches/server/0114-Fix-MC-177381.patch similarity index 100% rename from patches/server/0115-Fix-MC-177381.patch rename to patches/server/0114-Fix-MC-177381.patch diff --git a/patches/server/0116-Optimize-LeavesProtocolManager-init-protocol.patch b/patches/server/0115-Optimize-LeavesProtocolManager-init-protocol.patch similarity index 100% rename from patches/server/0116-Optimize-LeavesProtocolManager-init-protocol.patch rename to patches/server/0115-Optimize-LeavesProtocolManager-init-protocol.patch diff --git a/patches/server/0117-Cache-CraftEntityType-minecraftToBukkit-convert.patch b/patches/server/0116-Cache-CraftEntityType-minecraftToBukkit-convert.patch similarity index 100% rename from patches/server/0117-Cache-CraftEntityType-minecraftToBukkit-convert.patch rename to patches/server/0116-Cache-CraftEntityType-minecraftToBukkit-convert.patch diff --git a/patches/server/0118-Configurable-player-knockback-zombie.patch b/patches/server/0117-Configurable-player-knockback-zombie.patch similarity index 100% rename from patches/server/0118-Configurable-player-knockback-zombie.patch rename to patches/server/0117-Configurable-player-knockback-zombie.patch diff --git a/patches/server/0119-Hide-specified-item-components-to-clients.patch b/patches/server/0118-Hide-specified-item-components-to-clients.patch similarity index 100% rename from patches/server/0119-Hide-specified-item-components-to-clients.patch rename to patches/server/0118-Hide-specified-item-components-to-clients.patch diff --git a/patches/server/0120-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch b/patches/server/0119-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch similarity index 100% rename from patches/server/0120-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch rename to patches/server/0119-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch diff --git a/patches/server/0121-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/patches/server/0120-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch similarity index 100% rename from patches/server/0121-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch rename to patches/server/0120-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch diff --git a/patches/server/0122-Paper-PR-Throttle-failed-spawn-attempts.patch b/patches/server/0121-Paper-PR-Throttle-failed-spawn-attempts.patch similarity index 100% rename from patches/server/0122-Paper-PR-Throttle-failed-spawn-attempts.patch rename to patches/server/0121-Paper-PR-Throttle-failed-spawn-attempts.patch diff --git a/patches/server/0123-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/patches/server/0122-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch similarity index 100% rename from patches/server/0123-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch rename to patches/server/0122-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch diff --git a/patches/server/0124-Dont-send-useless-entity-packets.patch b/patches/server/0123-Dont-send-useless-entity-packets.patch similarity index 100% rename from patches/server/0124-Dont-send-useless-entity-packets.patch rename to patches/server/0123-Dont-send-useless-entity-packets.patch diff --git a/patches/server/0125-Don-t-spawn-if-lastSpawnState-is-null.patch b/patches/server/0124-Don-t-spawn-if-lastSpawnState-is-null.patch similarity index 100% rename from patches/server/0125-Don-t-spawn-if-lastSpawnState-is-null.patch rename to patches/server/0124-Don-t-spawn-if-lastSpawnState-is-null.patch diff --git a/patches/server/0126-Multithreaded-Tracker.patch b/patches/server/0125-Multithreaded-Tracker.patch similarity index 100% rename from patches/server/0126-Multithreaded-Tracker.patch rename to patches/server/0125-Multithreaded-Tracker.patch diff --git a/patches/server/0127-Nitori-Async-playerdata-Save.patch b/patches/server/0126-Nitori-Async-playerdata-Save.patch similarity index 100% rename from patches/server/0127-Nitori-Async-playerdata-Save.patch rename to patches/server/0126-Nitori-Async-playerdata-Save.patch diff --git a/patches/server/0128-Change-max-stack-count.patch b/patches/server/0127-Change-max-stack-count.patch similarity index 100% rename from patches/server/0128-Change-max-stack-count.patch rename to patches/server/0127-Change-max-stack-count.patch diff --git a/patches/server/0129-Reduce-object-complexity-to-make-block-isValid-calls.patch b/patches/server/0128-Reduce-object-complexity-to-make-block-isValid-calls.patch similarity index 100% rename from patches/server/0129-Reduce-object-complexity-to-make-block-isValid-calls.patch rename to patches/server/0128-Reduce-object-complexity-to-make-block-isValid-calls.patch diff --git a/patches/server/0130-Optimize-nearby-alive-players-for-spawning.patch b/patches/server/0129-Optimize-nearby-alive-players-for-spawning.patch similarity index 100% rename from patches/server/0130-Optimize-nearby-alive-players-for-spawning.patch rename to patches/server/0129-Optimize-nearby-alive-players-for-spawning.patch diff --git a/patches/server/0131-Cache-blockstate-cache.patch b/patches/server/0130-Cache-blockstate-cache.patch similarity index 100% rename from patches/server/0131-Cache-blockstate-cache.patch rename to patches/server/0130-Cache-blockstate-cache.patch diff --git a/patches/server/0132-Asynchronous-locator.patch b/patches/server/0131-Asynchronous-locator.patch similarity index 100% rename from patches/server/0132-Asynchronous-locator.patch rename to patches/server/0131-Asynchronous-locator.patch diff --git a/patches/server/0133-Smart-sort-entities-in-NearestLivingEntitySensor.patch b/patches/server/0132-Smart-sort-entities-in-NearestLivingEntitySensor.patch similarity index 100% rename from patches/server/0133-Smart-sort-entities-in-NearestLivingEntitySensor.patch rename to patches/server/0132-Smart-sort-entities-in-NearestLivingEntitySensor.patch diff --git a/patches/server/0134-Further-reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0133-Further-reduce-memory-footprint-of-CompoundTag.patch similarity index 100% rename from patches/server/0134-Further-reduce-memory-footprint-of-CompoundTag.patch rename to patches/server/0133-Further-reduce-memory-footprint-of-CompoundTag.patch diff --git a/patches/server/0135-Optimize-Entity-distanceToSqr.patch b/patches/server/0134-Optimize-Entity-distanceToSqr.patch similarity index 100% rename from patches/server/0135-Optimize-Entity-distanceToSqr.patch rename to patches/server/0134-Optimize-Entity-distanceToSqr.patch diff --git a/patches/server/0136-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch b/patches/server/0135-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch similarity index 100% rename from patches/server/0136-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch rename to patches/server/0135-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch diff --git a/patches/server/0137-EMC-Default-don-t-use-blockstate-snapshots.patch b/patches/server/0136-EMC-Default-don-t-use-blockstate-snapshots.patch similarity index 100% rename from patches/server/0137-EMC-Default-don-t-use-blockstate-snapshots.patch rename to patches/server/0136-EMC-Default-don-t-use-blockstate-snapshots.patch diff --git a/patches/server/0138-Cache-tile-entity-position.patch b/patches/server/0137-Cache-tile-entity-position.patch similarity index 100% rename from patches/server/0138-Cache-tile-entity-position.patch rename to patches/server/0137-Cache-tile-entity-position.patch diff --git a/patches/server/0139-TT20-Lag-compensation.patch b/patches/server/0138-TT20-Lag-compensation.patch similarity index 100% rename from patches/server/0139-TT20-Lag-compensation.patch rename to patches/server/0138-TT20-Lag-compensation.patch diff --git a/patches/server/0140-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch b/patches/server/0139-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch similarity index 100% rename from patches/server/0140-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch rename to patches/server/0139-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch diff --git a/patches/server/0141-C2ME-Reduce-Allocations.patch b/patches/server/0140-C2ME-Reduce-Allocations.patch similarity index 100% rename from patches/server/0141-C2ME-Reduce-Allocations.patch rename to patches/server/0140-C2ME-Reduce-Allocations.patch diff --git a/patches/server/0142-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch b/patches/server/0141-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch similarity index 100% rename from patches/server/0142-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch rename to patches/server/0141-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch diff --git a/patches/server/0143-Lithium-fast-util.patch b/patches/server/0142-Lithium-fast-util.patch similarity index 100% rename from patches/server/0143-Lithium-fast-util.patch rename to patches/server/0142-Lithium-fast-util.patch diff --git a/patches/server/0144-Lithium-CompactSineLUT.patch b/patches/server/0143-Lithium-CompactSineLUT.patch similarity index 100% rename from patches/server/0144-Lithium-CompactSineLUT.patch rename to patches/server/0143-Lithium-CompactSineLUT.patch diff --git a/patches/server/0145-Lithium-IterateOutwardsCache.patch b/patches/server/0144-Lithium-IterateOutwardsCache.patch similarity index 96% rename from patches/server/0145-Lithium-IterateOutwardsCache.patch rename to patches/server/0144-Lithium-IterateOutwardsCache.patch index d02b71b7b..bf452910a 100644 --- a/patches/server/0145-Lithium-IterateOutwardsCache.patch +++ b/patches/server/0144-Lithium-IterateOutwardsCache.patch @@ -1,8 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Taiyou06 Date: Fri, 8 Nov 2024 00:06:34 +0100 -Subject: [PATCH] Lithium-IterateOutwardsCache +Subject: [PATCH] Lithium: IterateOutwardsCache +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/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java index a64e5997b94cc8173f0512d1e282355f14f098ec..1d0f67e10a061225dfe99cbd935c4fb5a4cbe22b 100644 diff --git a/patches/server/0146-Lithium-HashedList.patch b/patches/server/0145-Lithium-HashedList.patch similarity index 75% rename from patches/server/0146-Lithium-HashedList.patch rename to patches/server/0145-Lithium-HashedList.patch index 3f3589d6d..9539fc084 100644 --- a/patches/server/0146-Lithium-HashedList.patch +++ b/patches/server/0145-Lithium-HashedList.patch @@ -1,11 +1,17 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Taiyou06 Date: Fri, 8 Nov 2024 00:14:03 +0100 -Subject: [PATCH] Lithium-HashedList +Subject: [PATCH] Lithium: HashedList +This patch is based on the following mixins: +* "me/jellysquid/mods/lithium/mixin/world/block_entity_ticking/collections/WorldMixin.java" (1.16.x/dev branch) +* "net/caffeinemc/mods/lithium/common/util/collections/HashedReferenceList.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/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 981bb6faec42c8b4d6d02cf42eebd410da0047b5..3d6d0524784a2658b8f61b4797ca4bbee894885a 100644 +index 981bb6faec42c8b4d6d02cf42eebd410da0047b5..a34ae9bfda0df2834565dc3ea1fb48f7f2efc099 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -116,9 +116,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl @@ -13,23 +19,26 @@ index 981bb6faec42c8b4d6d02cf42eebd410da0047b5..3d6d0524784a2658b8f61b4797ca4bbe public static final int MAX_ENTITY_SPAWN_Y = 20000000; public static final int MIN_ENTITY_SPAWN_Y = -20000000; - public final List blockEntityTickers = Lists.newArrayList(); // Paper - public -+ public final List blockEntityTickers = org.dreeam.leaf.util.HashedList.wrapper(Lists.newArrayList()); // Paper - public // Jettpack - lithium: hashed_list ++ public final List blockEntityTickers = new org.dreeam.leaf.util.HashedReferenceList<>(Lists.newArrayList()); // Paper - public // Leaf - Lithium - hashed list protected final NeighborUpdater neighborUpdater; - private final List pendingBlockEntityTickers = Lists.newArrayList(); -+ private final List pendingBlockEntityTickers = org.dreeam.leaf.util.HashedList.wrapper(Lists.newArrayList()); // Jettpack - lithium: hashed_list ++ private final List pendingBlockEntityTickers = new org.dreeam.leaf.util.HashedReferenceList<>(Lists.newArrayList()); // Leaf - Lithium - hashed list private boolean tickingBlockEntities; public final Thread thread; private final boolean isDebug; -diff --git a/src/main/java/org/dreeam/leaf/util/HashedList.java b/src/main/java/org/dreeam/leaf/util/HashedList.java +diff --git a/src/main/java/org/dreeam/leaf/util/HashedReferenceList.java b/src/main/java/org/dreeam/leaf/util/HashedReferenceList.java new file mode 100644 -index 0000000000000000000000000000000000000000..01b44f4a0273824aa346de8a5f19ba0d00669c54 +index 0000000000000000000000000000000000000000..8c08207496fac9b0cc839293354674e3ce7083ad --- /dev/null -+++ b/src/main/java/org/dreeam/leaf/util/HashedList.java -@@ -0,0 +1,280 @@ ++++ b/src/main/java/org/dreeam/leaf/util/HashedReferenceList.java +@@ -0,0 +1,282 @@ +package org.dreeam.leaf.util; + +import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap; +import it.unimi.dsi.fastutil.objects.ReferenceArrayList; ++import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; ++import org.jetbrains.annotations.NotNull; ++ +import java.util.Collection; +import java.util.Iterator; +import java.util.List; @@ -41,11 +50,11 @@ index 0000000000000000000000000000000000000000..01b44f4a0273824aa346de8a5f19ba0d + * contained by this list must use reference-equality semantics. + */ +@SuppressWarnings("SuspiciousMethodCalls") -+public class HashedList implements List { ++public class HashedReferenceList implements List { + private final ReferenceArrayList list; + private final Reference2IntOpenHashMap counter; + -+ public HashedList(List list) { ++ public HashedReferenceList(List list) { + this.list = new ReferenceArrayList<>(); + this.list.addAll(list); + @@ -84,7 +93,7 @@ index 0000000000000000000000000000000000000000..01b44f4a0273824aa346de8a5f19ba0d + + @SuppressWarnings("SuspiciousToArrayCall") + @Override -+ public T1[] toArray(T1[] a) { ++ public T1[] toArray(T1 @NotNull [] a) { + return this.list.toArray(a); + } + @@ -132,16 +141,18 @@ index 0000000000000000000000000000000000000000..01b44f4a0273824aa346de8a5f19ba0d + } + + @Override -+ public boolean removeAll(Collection c) { -+ for (Object obj : c) { -+ this.trackReferenceRemoved(obj); ++ public boolean removeAll(@NotNull Collection c) { ++ if (this.size() >= 2 && c.size() > 4 && c instanceof List) { ++ //HashReferenceList uses reference equality, so using ReferenceOpenHashSet is fine ++ c = new ReferenceOpenHashSet<>(c); + } -+ ++ this.counter.keySet().removeAll(c); + return this.list.removeAll(c); + } + + @Override -+ public boolean retainAll(Collection c) { ++ public boolean retainAll(@NotNull Collection c) { ++ this.counter.keySet().retainAll(c); + return this.list.retainAll(c); + } + @@ -206,8 +217,8 @@ index 0000000000000000000000000000000000000000..01b44f4a0273824aa346de8a5f19ba0d + + @Override + public ListIterator listIterator(int index) { -+ return new ListIterator() { -+ private final ListIterator inner = HashedList.this.list.listIterator(index); ++ return new ListIterator<>() { ++ private final ListIterator inner = HashedReferenceList.this.list.listIterator(index); + + @Override + public boolean hasNext() { @@ -247,10 +258,10 @@ index 0000000000000000000000000000000000000000..01b44f4a0273824aa346de8a5f19ba0d + throw new NoSuchElementException(); + } + -+ T prev = HashedList.this.get(last); ++ T prev = HashedReferenceList.this.get(last); + + if (prev != null) { -+ HashedList.this.trackReferenceRemoved(prev); ++ HashedReferenceList.this.trackReferenceRemoved(prev); + } + + this.inner.remove(); @@ -264,14 +275,14 @@ index 0000000000000000000000000000000000000000..01b44f4a0273824aa346de8a5f19ba0d + throw new NoSuchElementException(); + } + -+ T prev = HashedList.this.get(last); ++ T prev = HashedReferenceList.this.get(last); + + if (prev != t) { + if (prev != null) { -+ HashedList.this.trackReferenceRemoved(prev); ++ HashedReferenceList.this.trackReferenceRemoved(prev); + } + -+ HashedList.this.trackReferenceAdded(t); ++ HashedReferenceList.this.trackReferenceAdded(t); + } + + this.inner.remove(); @@ -279,7 +290,7 @@ index 0000000000000000000000000000000000000000..01b44f4a0273824aa346de8a5f19ba0d + + @Override + public void add(T t) { -+ HashedList.this.trackReferenceAdded(t); ++ HashedReferenceList.this.trackReferenceAdded(t); + + this.inner.add(t); + } @@ -302,7 +313,4 @@ index 0000000000000000000000000000000000000000..01b44f4a0273824aa346de8a5f19ba0d + } + } + -+ public static HashedList wrapper(List list) { -+ return new HashedList<>(list); -+ } +} diff --git a/patches/server/0147-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch b/patches/server/0146-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch similarity index 100% rename from patches/server/0147-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch rename to patches/server/0146-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch diff --git a/patches/server/0148-Better-inline-world-height.patch b/patches/server/0147-Better-inline-world-height.patch similarity index 97% rename from patches/server/0148-Better-inline-world-height.patch rename to patches/server/0147-Better-inline-world-height.patch index ebc9e6936..61b58624a 100644 --- a/patches/server/0148-Better-inline-world-height.patch +++ b/patches/server/0147-Better-inline-world-height.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Better inline world height diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 3d6d0524784a2658b8f61b4797ca4bbee894885a..bb9cf7648826e512159549b6cc44521f3b7cc943 100644 +index a34ae9bfda0df2834565dc3ea1fb48f7f2efc099..704631730cf7679446a98cea6faeb70eb89c9849 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -733,11 +733,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl diff --git a/patches/server/0149-Branchless-clamp-logic.patch b/patches/server/0148-Branchless-clamp-logic.patch similarity index 100% rename from patches/server/0149-Branchless-clamp-logic.patch rename to patches/server/0148-Branchless-clamp-logic.patch diff --git a/patches/server/0150-Use-faster-and-thread-safe-ban-list-date-format-pars.patch b/patches/server/0149-Use-faster-and-thread-safe-ban-list-date-format-pars.patch similarity index 100% rename from patches/server/0150-Use-faster-and-thread-safe-ban-list-date-format-pars.patch rename to patches/server/0149-Use-faster-and-thread-safe-ban-list-date-format-pars.patch