From 2bb96e70841a89edeb69192d0e2bc8222466b39d Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sun, 20 Oct 2024 14:00:07 -0400 Subject: [PATCH] [ci skip] Drop `Optimize check nearby fire or lava on entity move` --- ...k-nearby-fire-or-lava-on-entity-move.patch | 2 ++ ...getProfiler-in-PathNavigationRegion.patch} | 0 ...MC-65198.patch => 0066-Fix-MC-65198.patch} | 0 ...atch => 0067-Including-5s-in-getTPS.patch} | 0 ...eating-stats-json-bases-on-player-n.patch} | 0 ...9-Fix-NPE-during-creating-GUI-graph.patch} | 0 ...eption-on-missing-ResourceKey-value.patch} | 0 ...h => 0071-Improve-Purpur-AFK-system.patch} | 2 +- ...-Virtual-Thread-for-async-scheduler.patch} | 0 ...onfigurable-chat-message-signatures.patch} | 0 ... => 0074-Cache-player-profileResult.patch} | 0 ...n-editable-sign-warning-spam-in-con.patch} | 0 ...ed.patch => 0076-Matter-Secure-Seed.patch} | 4 ++-- ...d.patch => 0077-Matter-Seed-Command.patch} | 0 ...78-Ignore-terminal-provider-warning.patch} | 0 ...79-Fix-console-freeze-above-JAVA-22.patch} | 0 ...output-display-on-Pterodactyl-panel.patch} | 0 ...tch => 0081-Faster-Random-Generator.patch} | 0 ...> 0082-Don-t-save-primed-tnt-entity.patch} | 0 ...083-Don-t-save-falling-block-entity.patch} | 0 ...084-Configurable-connection-message.patch} | 0 ...onfigurable-unknown-command-message.patch} | 0 ...-Remove-stream-in-PoiCompetitorScan.patch} | 0 ...-in-BlockBehaviour-cache-blockstate.patch} | 0 ...tream-in-RecipeManager-getRecipeFor.patch} | 0 ...am-in-entity-visible-effects-filter.patch} | 2 +- ...tive-effects-map-with-optimized-col.patch} | 2 +- ...=> 0091-Reduce-worldgen-allocations.patch} | 0 ...-183518.patch => 0092-Fix-MC-183518.patch} | 0 ...e-kickPermission-instead-of-using-g.patch} | 2 +- ...-place-player-if-the-server-is-full.patch} | 2 +- ...-200418.patch => 0095-Fix-MC-200418.patch} | 0 ...-119417.patch => 0096-Fix-MC-119417.patch} | 2 +- ...-223153.patch => 0097-Fix-MC-223153.patch} | 0 ...LeavesProtocolManager-init-protocol.patch} | 0 ...ntityType-minecraftToBukkit-convert.patch} | 2 +- ...onfigurable-player-knockback-zombie.patch} | 2 +- ...pecified-item-components-to-clients.patch} | 4 ++-- ...during-inactive-ticks-for-non-aware.patch} | 2 +- ...ork-done-in-CraftMapCanvas.drawImag.patch} | 0 ...r-PR-Throttle-failed-spawn-attempts.patch} | 2 +- ...zombie-reinforcements-loading-chunk.patch} | 0 ...06-Dont-send-useless-entity-packets.patch} | 0 ...n-t-spawn-if-lastSpawnState-is-null.patch} | 0 ...patch => 0108-Multithreaded-Tracker.patch} | 24 +++++++++---------- ...> 0109-Nitori-Async-playerdata-Save.patch} | 0 ...atch => 0110-Change-max-stack-count.patch} | 0 ...-double-iteration-in-enough-deep-sl.patch} | 0 48 files changed, 28 insertions(+), 26 deletions(-) rename patches/{ => removed}/server/0093-Optimize-check-nearby-fire-or-lava-on-entity-move.patch (98%) rename patches/server/{0059-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch => 0065-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch} (100%) rename patches/server/{0060-Fix-MC-65198.patch => 0066-Fix-MC-65198.patch} (100%) rename patches/server/{0061-Including-5s-in-getTPS.patch => 0067-Including-5s-in-getTPS.patch} (100%) rename patches/server/{0062-Remove-useless-creating-stats-json-bases-on-player-n.patch => 0068-Remove-useless-creating-stats-json-bases-on-player-n.patch} (100%) rename patches/server/{0063-Fix-NPE-during-creating-GUI-graph.patch => 0069-Fix-NPE-during-creating-GUI-graph.patch} (100%) rename patches/server/{0064-Don-t-throw-exception-on-missing-ResourceKey-value.patch => 0070-Don-t-throw-exception-on-missing-ResourceKey-value.patch} (100%) rename patches/server/{0065-Improve-Purpur-AFK-system.patch => 0071-Improve-Purpur-AFK-system.patch} (99%) rename patches/server/{0066-Virtual-Thread-for-async-scheduler.patch => 0072-Virtual-Thread-for-async-scheduler.patch} (100%) rename patches/server/{0067-Mirai-Configurable-chat-message-signatures.patch => 0073-Mirai-Configurable-chat-message-signatures.patch} (100%) rename patches/server/{0068-Cache-player-profileResult.patch => 0074-Cache-player-profileResult.patch} (100%) rename patches/server/{0069-Prevent-change-non-editable-sign-warning-spam-in-con.patch => 0075-Prevent-change-non-editable-sign-warning-spam-in-con.patch} (100%) rename patches/server/{0070-Matter-Secure-Seed.patch => 0076-Matter-Secure-Seed.patch} (99%) rename patches/server/{0071-Matter-Seed-Command.patch => 0077-Matter-Seed-Command.patch} (100%) rename patches/server/{0072-Ignore-terminal-provider-warning.patch => 0078-Ignore-terminal-provider-warning.patch} (100%) rename patches/server/{0073-Fix-console-freeze-above-JAVA-22.patch => 0079-Fix-console-freeze-above-JAVA-22.patch} (100%) rename patches/server/{0074-Fix-console-output-display-on-Pterodactyl-panel.patch => 0080-Fix-console-output-display-on-Pterodactyl-panel.patch} (100%) rename patches/server/{0075-Faster-Random-Generator.patch => 0081-Faster-Random-Generator.patch} (100%) rename patches/server/{0076-Don-t-save-primed-tnt-entity.patch => 0082-Don-t-save-primed-tnt-entity.patch} (100%) rename patches/server/{0077-Don-t-save-falling-block-entity.patch => 0083-Don-t-save-falling-block-entity.patch} (100%) rename patches/server/{0078-Configurable-connection-message.patch => 0084-Configurable-connection-message.patch} (100%) rename patches/server/{0079-Configurable-unknown-command-message.patch => 0085-Configurable-unknown-command-message.patch} (100%) rename patches/server/{0080-Airplane-Remove-stream-in-PoiCompetitorScan.patch => 0086-Airplane-Remove-stream-in-PoiCompetitorScan.patch} (100%) rename patches/server/{0081-Remove-stream-in-BlockBehaviour-cache-blockstate.patch => 0087-Remove-stream-in-BlockBehaviour-cache-blockstate.patch} (100%) rename patches/server/{0082-Remove-stream-in-RecipeManager-getRecipeFor.patch => 0088-Remove-stream-in-RecipeManager-getRecipeFor.patch} (100%) rename patches/server/{0083-Remove-stream-in-entity-visible-effects-filter.patch => 0089-Remove-stream-in-entity-visible-effects-filter.patch} (93%) rename patches/server/{0084-Replace-Entity-active-effects-map-with-optimized-col.patch => 0090-Replace-Entity-active-effects-map-with-optimized-col.patch} (96%) rename patches/server/{0085-Reduce-worldgen-allocations.patch => 0091-Reduce-worldgen-allocations.patch} (100%) rename patches/server/{0086-Fix-MC-183518.patch => 0092-Fix-MC-183518.patch} (100%) rename patches/server/{0087-Use-caffeine-cache-kickPermission-instead-of-using-g.patch => 0093-Use-caffeine-cache-kickPermission-instead-of-using-g.patch} (96%) rename patches/server/{0088-Do-not-place-player-if-the-server-is-full.patch => 0094-Do-not-place-player-if-the-server-is-full.patch} (97%) rename patches/server/{0089-Fix-MC-200418.patch => 0095-Fix-MC-200418.patch} (100%) rename patches/server/{0090-Fix-MC-119417.patch => 0096-Fix-MC-119417.patch} (91%) rename patches/server/{0091-Fix-MC-223153.patch => 0097-Fix-MC-223153.patch} (100%) rename patches/server/{0092-Optimize-LeavesProtocolManager-init-protocol.patch => 0098-Optimize-LeavesProtocolManager-init-protocol.patch} (100%) rename patches/server/{0094-Cache-CraftEntityType-minecraftToBukkit-convert.patch => 0099-Cache-CraftEntityType-minecraftToBukkit-convert.patch} (99%) rename patches/server/{0095-Configurable-player-knockback-zombie.patch => 0100-Configurable-player-knockback-zombie.patch} (97%) rename patches/server/{0096-Hide-specified-item-components-to-clients.patch => 0101-Hide-specified-item-components-to-clients.patch} (98%) rename patches/server/{0097-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch => 0102-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch} (97%) rename patches/server/{0098-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch => 0103-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch} (100%) rename patches/server/{0099-Paper-PR-Throttle-failed-spawn-attempts.patch => 0104-Paper-PR-Throttle-failed-spawn-attempts.patch} (98%) rename patches/server/{0100-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch => 0105-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch} (100%) rename patches/server/{0101-Dont-send-useless-entity-packets.patch => 0106-Dont-send-useless-entity-packets.patch} (100%) rename patches/server/{0102-Don-t-spawn-if-lastSpawnState-is-null.patch => 0107-Don-t-spawn-if-lastSpawnState-is-null.patch} (100%) rename patches/server/{0103-Multithreaded-Tracker.patch => 0108-Multithreaded-Tracker.patch} (97%) rename patches/server/{0104-Nitori-Async-playerdata-Save.patch => 0109-Nitori-Async-playerdata-Save.patch} (100%) rename patches/server/{0105-Change-max-stack-count.patch => 0110-Change-max-stack-count.patch} (100%) rename patches/server/{0106-Remove-stream-and-double-iteration-in-enough-deep-sl.patch => 0111-Remove-stream-and-double-iteration-in-enough-deep-sl.patch} (100%) diff --git a/patches/server/0093-Optimize-check-nearby-fire-or-lava-on-entity-move.patch b/patches/removed/server/0093-Optimize-check-nearby-fire-or-lava-on-entity-move.patch similarity index 98% rename from patches/server/0093-Optimize-check-nearby-fire-or-lava-on-entity-move.patch rename to patches/removed/server/0093-Optimize-check-nearby-fire-or-lava-on-entity-move.patch index 0f6a1419..26f6da00 100644 --- a/patches/server/0093-Optimize-check-nearby-fire-or-lava-on-entity-move.patch +++ b/patches/removed/server/0093-Optimize-check-nearby-fire-or-lava-on-entity-move.patch @@ -3,6 +3,8 @@ From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 15 Jul 2024 22:11:35 +0800 Subject: [PATCH] Optimize check nearby fire or lava on entity move +Removed since 1.21.1, replaced by SpottedLeaf's better solution + Remove stream and remove double Mth.floor() convert before 1700ms, after 370ms, in massive stacked minecart test diff --git a/patches/server/0059-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch b/patches/server/0065-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch similarity index 100% rename from patches/server/0059-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch rename to patches/server/0065-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch diff --git a/patches/server/0060-Fix-MC-65198.patch b/patches/server/0066-Fix-MC-65198.patch similarity index 100% rename from patches/server/0060-Fix-MC-65198.patch rename to patches/server/0066-Fix-MC-65198.patch diff --git a/patches/server/0061-Including-5s-in-getTPS.patch b/patches/server/0067-Including-5s-in-getTPS.patch similarity index 100% rename from patches/server/0061-Including-5s-in-getTPS.patch rename to patches/server/0067-Including-5s-in-getTPS.patch diff --git a/patches/server/0062-Remove-useless-creating-stats-json-bases-on-player-n.patch b/patches/server/0068-Remove-useless-creating-stats-json-bases-on-player-n.patch similarity index 100% rename from patches/server/0062-Remove-useless-creating-stats-json-bases-on-player-n.patch rename to patches/server/0068-Remove-useless-creating-stats-json-bases-on-player-n.patch diff --git a/patches/server/0063-Fix-NPE-during-creating-GUI-graph.patch b/patches/server/0069-Fix-NPE-during-creating-GUI-graph.patch similarity index 100% rename from patches/server/0063-Fix-NPE-during-creating-GUI-graph.patch rename to patches/server/0069-Fix-NPE-during-creating-GUI-graph.patch diff --git a/patches/server/0064-Don-t-throw-exception-on-missing-ResourceKey-value.patch b/patches/server/0070-Don-t-throw-exception-on-missing-ResourceKey-value.patch similarity index 100% rename from patches/server/0064-Don-t-throw-exception-on-missing-ResourceKey-value.patch rename to patches/server/0070-Don-t-throw-exception-on-missing-ResourceKey-value.patch diff --git a/patches/server/0065-Improve-Purpur-AFK-system.patch b/patches/server/0071-Improve-Purpur-AFK-system.patch similarity index 99% rename from patches/server/0065-Improve-Purpur-AFK-system.patch rename to patches/server/0071-Improve-Purpur-AFK-system.patch index edb487d8..7d7b17e2 100644 --- a/patches/server/0065-Improve-Purpur-AFK-system.patch +++ b/patches/server/0071-Improve-Purpur-AFK-system.patch @@ -57,7 +57,7 @@ index 7c6bda95b8b08cc70182f19cf0b991f78d28c235..79df52237b7a5822e0cbaff015ccd193 } else { getBukkitEntity().setPlayerListName(prefix + scoreboardName + suffix, true); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 96f6279eb5567f72fcd0b99f22385e083c5fa9b3..31c3b9e281708784631230d80c4777f1486f26d5 100644 +index 66614635b27dbcc6d4de027f1b1e32f0fd4b4dba..bbe9ff565f40663bd6a44baa46e9d558d54c7953 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2276,6 +2276,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0066-Virtual-Thread-for-async-scheduler.patch b/patches/server/0072-Virtual-Thread-for-async-scheduler.patch similarity index 100% rename from patches/server/0066-Virtual-Thread-for-async-scheduler.patch rename to patches/server/0072-Virtual-Thread-for-async-scheduler.patch diff --git a/patches/server/0067-Mirai-Configurable-chat-message-signatures.patch b/patches/server/0073-Mirai-Configurable-chat-message-signatures.patch similarity index 100% rename from patches/server/0067-Mirai-Configurable-chat-message-signatures.patch rename to patches/server/0073-Mirai-Configurable-chat-message-signatures.patch diff --git a/patches/server/0068-Cache-player-profileResult.patch b/patches/server/0074-Cache-player-profileResult.patch similarity index 100% rename from patches/server/0068-Cache-player-profileResult.patch rename to patches/server/0074-Cache-player-profileResult.patch diff --git a/patches/server/0069-Prevent-change-non-editable-sign-warning-spam-in-con.patch b/patches/server/0075-Prevent-change-non-editable-sign-warning-spam-in-con.patch similarity index 100% rename from patches/server/0069-Prevent-change-non-editable-sign-warning-spam-in-con.patch rename to patches/server/0075-Prevent-change-non-editable-sign-warning-spam-in-con.patch diff --git a/patches/server/0070-Matter-Secure-Seed.patch b/patches/server/0076-Matter-Secure-Seed.patch similarity index 99% rename from patches/server/0070-Matter-Secure-Seed.patch rename to patches/server/0076-Matter-Secure-Seed.patch index e638378b..7dedaa36 100644 --- a/patches/server/0070-Matter-Secure-Seed.patch +++ b/patches/server/0076-Matter-Secure-Seed.patch @@ -46,7 +46,7 @@ index 74bf36f75b59b1e21b72afcf653447864d7c3f80..ef2d70c1bd21cff6a080205c38bbe8bf } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 1a50562c962769a158f6514730d8ec9094f733e0..a4cffdb78dafd658f35e34d0b702a8c892141539 100644 +index f3190e4b548769f56f07bae06204bb18dbc88ece..d57e814fd353903ed6fcec59802acb9c3455bd96 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -559,6 +559,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf. @@ -450,7 +450,7 @@ index 45e262308aebafa377a2353661acdd122933b99e..96b9e91997bba777ebe868ca5ab5e5e9 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1b9685f759481282ba4be599169a60aba2b2012a..b7ba2c47ad7127a6ba2e1cf6a6996f9d8ad9d7c6 100644 +index 72e3db6b666913c20e5435bb606fb506a74458da..5fc580f4a0cd3b5a2a3a3e787177270fcef25aa7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1402,7 +1402,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0071-Matter-Seed-Command.patch b/patches/server/0077-Matter-Seed-Command.patch similarity index 100% rename from patches/server/0071-Matter-Seed-Command.patch rename to patches/server/0077-Matter-Seed-Command.patch diff --git a/patches/server/0072-Ignore-terminal-provider-warning.patch b/patches/server/0078-Ignore-terminal-provider-warning.patch similarity index 100% rename from patches/server/0072-Ignore-terminal-provider-warning.patch rename to patches/server/0078-Ignore-terminal-provider-warning.patch diff --git a/patches/server/0073-Fix-console-freeze-above-JAVA-22.patch b/patches/server/0079-Fix-console-freeze-above-JAVA-22.patch similarity index 100% rename from patches/server/0073-Fix-console-freeze-above-JAVA-22.patch rename to patches/server/0079-Fix-console-freeze-above-JAVA-22.patch diff --git a/patches/server/0074-Fix-console-output-display-on-Pterodactyl-panel.patch b/patches/server/0080-Fix-console-output-display-on-Pterodactyl-panel.patch similarity index 100% rename from patches/server/0074-Fix-console-output-display-on-Pterodactyl-panel.patch rename to patches/server/0080-Fix-console-output-display-on-Pterodactyl-panel.patch diff --git a/patches/server/0075-Faster-Random-Generator.patch b/patches/server/0081-Faster-Random-Generator.patch similarity index 100% rename from patches/server/0075-Faster-Random-Generator.patch rename to patches/server/0081-Faster-Random-Generator.patch diff --git a/patches/server/0076-Don-t-save-primed-tnt-entity.patch b/patches/server/0082-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0076-Don-t-save-primed-tnt-entity.patch rename to patches/server/0082-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0077-Don-t-save-falling-block-entity.patch b/patches/server/0083-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0077-Don-t-save-falling-block-entity.patch rename to patches/server/0083-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0078-Configurable-connection-message.patch b/patches/server/0084-Configurable-connection-message.patch similarity index 100% rename from patches/server/0078-Configurable-connection-message.patch rename to patches/server/0084-Configurable-connection-message.patch diff --git a/patches/server/0079-Configurable-unknown-command-message.patch b/patches/server/0085-Configurable-unknown-command-message.patch similarity index 100% rename from patches/server/0079-Configurable-unknown-command-message.patch rename to patches/server/0085-Configurable-unknown-command-message.patch diff --git a/patches/server/0080-Airplane-Remove-stream-in-PoiCompetitorScan.patch b/patches/server/0086-Airplane-Remove-stream-in-PoiCompetitorScan.patch similarity index 100% rename from patches/server/0080-Airplane-Remove-stream-in-PoiCompetitorScan.patch rename to patches/server/0086-Airplane-Remove-stream-in-PoiCompetitorScan.patch diff --git a/patches/server/0081-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/patches/server/0087-Remove-stream-in-BlockBehaviour-cache-blockstate.patch similarity index 100% rename from patches/server/0081-Remove-stream-in-BlockBehaviour-cache-blockstate.patch rename to patches/server/0087-Remove-stream-in-BlockBehaviour-cache-blockstate.patch diff --git a/patches/server/0082-Remove-stream-in-RecipeManager-getRecipeFor.patch b/patches/server/0088-Remove-stream-in-RecipeManager-getRecipeFor.patch similarity index 100% rename from patches/server/0082-Remove-stream-in-RecipeManager-getRecipeFor.patch rename to patches/server/0088-Remove-stream-in-RecipeManager-getRecipeFor.patch diff --git a/patches/server/0083-Remove-stream-in-entity-visible-effects-filter.patch b/patches/server/0089-Remove-stream-in-entity-visible-effects-filter.patch similarity index 93% rename from patches/server/0083-Remove-stream-in-entity-visible-effects-filter.patch rename to patches/server/0089-Remove-stream-in-entity-visible-effects-filter.patch index e030359a..caeb74c5 100644 --- a/patches/server/0083-Remove-stream-in-entity-visible-effects-filter.patch +++ b/patches/server/0089-Remove-stream-in-entity-visible-effects-filter.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove stream in entity visible effects filter diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 24c8abb2bc19e5335a7fa6e41549db11fc6a3198..731105edcdef57b5e497fd6c0a556c6180dd6e3f 100644 +index 21336bdb0f05e06355c03367c74a01103fe52a86..2539f688102a3c9c10ddeff39f3562668e9010be 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1009,7 +1009,15 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0084-Replace-Entity-active-effects-map-with-optimized-col.patch b/patches/server/0090-Replace-Entity-active-effects-map-with-optimized-col.patch similarity index 96% rename from patches/server/0084-Replace-Entity-active-effects-map-with-optimized-col.patch rename to patches/server/0090-Replace-Entity-active-effects-map-with-optimized-col.patch index 9e53cc24..67b44a16 100644 --- a/patches/server/0084-Replace-Entity-active-effects-map-with-optimized-col.patch +++ b/patches/server/0090-Replace-Entity-active-effects-map-with-optimized-col.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Replace Entity active effects map with optimized collection diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 731105edcdef57b5e497fd6c0a556c6180dd6e3f..bc3075fcba4e3c5e9e927928bbc432c0e4d1bc96 100644 +index 2539f688102a3c9c10ddeff39f3562668e9010be..827162f51cc58bd090ddc3576e5fe21043075e8d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -199,7 +199,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0085-Reduce-worldgen-allocations.patch b/patches/server/0091-Reduce-worldgen-allocations.patch similarity index 100% rename from patches/server/0085-Reduce-worldgen-allocations.patch rename to patches/server/0091-Reduce-worldgen-allocations.patch diff --git a/patches/server/0086-Fix-MC-183518.patch b/patches/server/0092-Fix-MC-183518.patch similarity index 100% rename from patches/server/0086-Fix-MC-183518.patch rename to patches/server/0092-Fix-MC-183518.patch diff --git a/patches/server/0087-Use-caffeine-cache-kickPermission-instead-of-using-g.patch b/patches/server/0093-Use-caffeine-cache-kickPermission-instead-of-using-g.patch similarity index 96% rename from patches/server/0087-Use-caffeine-cache-kickPermission-instead-of-using-g.patch rename to patches/server/0093-Use-caffeine-cache-kickPermission-instead-of-using-g.patch index d361bd3c..dda38940 100644 --- a/patches/server/0087-Use-caffeine-cache-kickPermission-instead-of-using-g.patch +++ b/patches/server/0093-Use-caffeine-cache-kickPermission-instead-of-using-g.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use caffeine cache kickPermission instead of using diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 31c3b9e281708784631230d80c4777f1486f26d5..98133a57f3f1b28dbc40de45ca755eff13463c7f 100644 +index bbe9ff565f40663bd6a44baa46e9d558d54c7953..6469cd96f0ecb98f4e15e9865837d8c6a07128ad 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -339,17 +339,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0088-Do-not-place-player-if-the-server-is-full.patch b/patches/server/0094-Do-not-place-player-if-the-server-is-full.patch similarity index 97% rename from patches/server/0088-Do-not-place-player-if-the-server-is-full.patch rename to patches/server/0094-Do-not-place-player-if-the-server-is-full.patch index 0e78b0e8..77d78b4e 100644 --- a/patches/server/0088-Do-not-place-player-if-the-server-is-full.patch +++ b/patches/server/0094-Do-not-place-player-if-the-server-is-full.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Do not place player if the server is full Fix https://github.com/PaperMC/Paper/issues/10668 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b58d4699b4496658934ad9cd713aec9a000dd08e..dac5967088d29297612536f7da8ab9658624e2ed 100644 +index 2614933317f102a0f559374d2bb8efc70b230e85..27015c62e1c45d36e58ae1323417739836632933 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -380,6 +380,13 @@ public abstract class PlayerList { diff --git a/patches/server/0089-Fix-MC-200418.patch b/patches/server/0095-Fix-MC-200418.patch similarity index 100% rename from patches/server/0089-Fix-MC-200418.patch rename to patches/server/0095-Fix-MC-200418.patch diff --git a/patches/server/0090-Fix-MC-119417.patch b/patches/server/0096-Fix-MC-119417.patch similarity index 91% rename from patches/server/0090-Fix-MC-119417.patch rename to patches/server/0096-Fix-MC-119417.patch index 620aa778..3f63f444 100644 --- a/patches/server/0090-Fix-MC-119417.patch +++ b/patches/server/0096-Fix-MC-119417.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix-MC-119417 Related MC issue: https://bugs.mojang.com/browse/MC-119417 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9fb0372511710cb27ffb18f9879e3ff3a0384427..2dc8767b96c2d55c081171037e20ec7e9f2f858b 100644 +index 79df52237b7a5822e0cbaff015ccd193a8195980..edef689792b163e6a33921fe2e4b1af69715a2ee 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2260,6 +2260,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple diff --git a/patches/server/0091-Fix-MC-223153.patch b/patches/server/0097-Fix-MC-223153.patch similarity index 100% rename from patches/server/0091-Fix-MC-223153.patch rename to patches/server/0097-Fix-MC-223153.patch diff --git a/patches/server/0092-Optimize-LeavesProtocolManager-init-protocol.patch b/patches/server/0098-Optimize-LeavesProtocolManager-init-protocol.patch similarity index 100% rename from patches/server/0092-Optimize-LeavesProtocolManager-init-protocol.patch rename to patches/server/0098-Optimize-LeavesProtocolManager-init-protocol.patch diff --git a/patches/server/0094-Cache-CraftEntityType-minecraftToBukkit-convert.patch b/patches/server/0099-Cache-CraftEntityType-minecraftToBukkit-convert.patch similarity index 99% rename from patches/server/0094-Cache-CraftEntityType-minecraftToBukkit-convert.patch rename to patches/server/0099-Cache-CraftEntityType-minecraftToBukkit-convert.patch index 9598f847..bbc36d98 100644 --- a/patches/server/0094-Cache-CraftEntityType-minecraftToBukkit-convert.patch +++ b/patches/server/0099-Cache-CraftEntityType-minecraftToBukkit-convert.patch @@ -108,7 +108,7 @@ index 1e7a27bc783e68f9579d4d3c72ec165bde7175b9..72dfd388bb784009ac77ff0c93db56eb @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 2bcd77af7cb84ebc1f4051976af822e4d3966f3f..08e380b7b086e1d6e03dc140c6b6ffac23393de9 100644 +index 77c04c79a7cf58c4f862ca92f4eca24146796fb7..b0058d6895b00c10d28113ae7e37223c9cd107db 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -83,7 +83,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0095-Configurable-player-knockback-zombie.patch b/patches/server/0100-Configurable-player-knockback-zombie.patch similarity index 97% rename from patches/server/0095-Configurable-player-knockback-zombie.patch rename to patches/server/0100-Configurable-player-knockback-zombie.patch index e3196992..8e10f99b 100644 --- a/patches/server/0095-Configurable-player-knockback-zombie.patch +++ b/patches/server/0100-Configurable-player-knockback-zombie.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable player knockback zombie diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index bc3075fcba4e3c5e9e927928bbc432c0e4d1bc96..eb8ddcb671e0c3eacee26e12eb5e96896a85868d 100644 +index 827162f51cc58bd090ddc3576e5fe21043075e8d..328630ff8df5bf67e5df190443e436e996942257 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2037,6 +2037,8 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0096-Hide-specified-item-components-to-clients.patch b/patches/server/0101-Hide-specified-item-components-to-clients.patch similarity index 98% rename from patches/server/0096-Hide-specified-item-components-to-clients.patch rename to patches/server/0101-Hide-specified-item-components-to-clients.patch index a9a25656..882a310a 100644 --- a/patches/server/0096-Hide-specified-item-components-to-clients.patch +++ b/patches/server/0101-Hide-specified-item-components-to-clients.patch @@ -65,7 +65,7 @@ index 573c380e123473e35c0b72c44b32c8d6ba8e61c6..feacc41ecf7f4028e0a1cce5d2012ced } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8c84f58c0d943f0a5abda490bcef8160b97b9b0f..db4a6be9d4494463471cb64034d1cf59ad489fd2 100644 +index 6469cd96f0ecb98f4e15e9865837d8c6a07128ad..846ddd4fcbb14db6f3eac9169de6850c18db3d94 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2963,7 +2963,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -78,7 +78,7 @@ index 8c84f58c0d943f0a5abda490bcef8160b97b9b0f..db4a6be9d4494463471cb64034d1cf59 ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - fix slot desync - always refresh player inventory diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index eb8ddcb671e0c3eacee26e12eb5e96896a85868d..8835b3213b91bcbb625260c84d408e45ccc40537 100644 +index 328630ff8df5bf67e5df190443e436e996942257..b6402881d5ee626e07996c3ceac1ac49ce2751c1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3413,7 +3413,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0097-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch b/patches/server/0102-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch similarity index 97% rename from patches/server/0097-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch rename to patches/server/0102-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch index 5c061cbb..d899afa2 100644 --- a/patches/server/0097-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch +++ b/patches/server/0102-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch @@ -24,7 +24,7 @@ index 02d7180e5b932dd8c7e8867f1334cbc47e26f5bd..9d196c8a8a0dc49a54264471429b6ff6 if (this.goalSelector.inactiveTick(this.activatedPriority, true) && !isThrottled) { // Pufferfish - pass activated priroity // Pufferfish - throttle inactive goal selector ticking this.goalSelector.tick(); diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 77363d072d48313fe6c0d00dc720813a88997ab1..a6ba083b39c95dfbbd15e668032350fcb02cd256 100644 +index 249e42bd1506bfcd00a656b31f9d62c78d9ee4bf..8b17ac9fd141c4d321b40e5b19f3fd1c901ab1a9 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -324,7 +324,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/patches/server/0098-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/patches/server/0103-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch similarity index 100% rename from patches/server/0098-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch rename to patches/server/0103-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch diff --git a/patches/server/0099-Paper-PR-Throttle-failed-spawn-attempts.patch b/patches/server/0104-Paper-PR-Throttle-failed-spawn-attempts.patch similarity index 98% rename from patches/server/0099-Paper-PR-Throttle-failed-spawn-attempts.patch rename to patches/server/0104-Paper-PR-Throttle-failed-spawn-attempts.patch index 725cf225..65b8ccf8 100644 --- a/patches/server/0099-Paper-PR-Throttle-failed-spawn-attempts.patch +++ b/patches/server/0104-Paper-PR-Throttle-failed-spawn-attempts.patch @@ -31,7 +31,7 @@ vain. Throttling spawn attempts in suspected spawnproof chunks improves performance without noticeably advantaging or disadvantaging the mob farm. diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index fd3b1c10695634f65c7291016bf671c084bc4d57..d97a534cb878e0ff7520232f70d83d02b27bf26a 100644 +index c867796f625813797f167610ad443c4be5a7561e..04d13abd8d98f4e72732afbdbb9719d835389793 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java @@ -190,6 +190,15 @@ public class WorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0100-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/patches/server/0105-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch similarity index 100% rename from patches/server/0100-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch rename to patches/server/0105-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch diff --git a/patches/server/0101-Dont-send-useless-entity-packets.patch b/patches/server/0106-Dont-send-useless-entity-packets.patch similarity index 100% rename from patches/server/0101-Dont-send-useless-entity-packets.patch rename to patches/server/0106-Dont-send-useless-entity-packets.patch diff --git a/patches/server/0102-Don-t-spawn-if-lastSpawnState-is-null.patch b/patches/server/0107-Don-t-spawn-if-lastSpawnState-is-null.patch similarity index 100% rename from patches/server/0102-Don-t-spawn-if-lastSpawnState-is-null.patch rename to patches/server/0107-Don-t-spawn-if-lastSpawnState-is-null.patch diff --git a/patches/server/0103-Multithreaded-Tracker.patch b/patches/server/0108-Multithreaded-Tracker.patch similarity index 97% rename from patches/server/0103-Multithreaded-Tracker.patch rename to patches/server/0108-Multithreaded-Tracker.patch index 3686dbe4..2de298db 100644 --- a/patches/server/0103-Multithreaded-Tracker.patch +++ b/patches/server/0108-Multithreaded-Tracker.patch @@ -40,7 +40,7 @@ index e42677bb004201efe1702779a78cc8d0ca05e80f..6676be8304e9415099ed423d3315180c } // Leaves start - skip photographer diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index dde015810f6e914ad99dcb8ab66c7aa33e1b8c26..d51d633f0ede4f9f539583e4261deb8b30065972 100644 +index 6985da233e41a62bea04277260f81b3ba200a415..965c147a5d9c300be19418d56736e5719dd10ad4 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -234,6 +234,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -59,7 +59,7 @@ index dde015810f6e914ad99dcb8ab66c7aa33e1b8c26..d51d633f0ede4f9f539583e4261deb8b for (int i = 0, len = inRange.size(); i < len; i++) { ++(backingSet[i].mobCounts[index]); } -@@ -906,6 +915,21 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -972,6 +981,21 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider ((ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity)entity).moonrise$setTrackedEntity(null); // Paper - optimise entity tracker } @@ -81,7 +81,7 @@ index dde015810f6e914ad99dcb8ab66c7aa33e1b8c26..d51d633f0ede4f9f539583e4261deb8b // Paper start - optimise entity tracker private void newTrackerTick() { final ca.spottedleaf.moonrise.common.misc.NearbyPlayers nearbyPlayers = ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)this.level).moonrise$getNearbyPlayers(); -@@ -939,6 +963,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1005,6 +1029,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider // Paper end - optimise entity tracker protected void tick() { @@ -95,7 +95,7 @@ index dde015810f6e914ad99dcb8ab66c7aa33e1b8c26..d51d633f0ede4f9f539583e4261deb8b // Paper start - optimise entity tracker if (true) { this.newTrackerTick(); -@@ -1088,7 +1119,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1154,7 +1185,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider final Entity entity; private final int range; SectionPos lastSectionPos; @@ -106,7 +106,7 @@ index dde015810f6e914ad99dcb8ab66c7aa33e1b8c26..d51d633f0ede4f9f539583e4261deb8b // Paper start - optimise entity tracker private long lastChunkUpdate = -1L; -@@ -1116,6 +1149,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1182,6 +1215,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider final ServerPlayer[] playersRaw = players.getRawDataUnchecked(); @@ -144,7 +144,7 @@ index dde015810f6e914ad99dcb8ab66c7aa33e1b8c26..d51d633f0ede4f9f539583e4261deb8b for (int i = 0, len = players.size(); i < len; ++i) { final ServerPlayer player = playersRaw[i]; this.updatePlayer(player); -@@ -1130,6 +1194,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1196,6 +1260,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } } } @@ -153,7 +153,7 @@ index dde015810f6e914ad99dcb8ab66c7aa33e1b8c26..d51d633f0ede4f9f539583e4261deb8b } @Override -@@ -1184,14 +1250,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1250,14 +1316,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } public void broadcast(Packet packet) { @@ -171,7 +171,7 @@ index dde015810f6e914ad99dcb8ab66c7aa33e1b8c26..d51d633f0ede4f9f539583e4261deb8b } public void broadcastAndSend(Packet packet) { -@@ -1203,18 +1266,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1269,18 +1332,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } public void broadcastRemoved() { @@ -194,7 +194,7 @@ index dde015810f6e914ad99dcb8ab66c7aa33e1b8c26..d51d633f0ede4f9f539583e4261deb8b if (this.seenBy.remove(player.connection)) { this.serverEntity.removePairing(player); } -@@ -1222,8 +1282,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1288,8 +1348,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } public void updatePlayer(ServerPlayer player) { @@ -283,10 +283,10 @@ index 05125144ce0cb50fa6ac769fa025cda010c93f14..3b40fc420ec1a8aca4c66a77f54cf628 set.clear(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index fef97efb91a06722c895583ea5cc54cdee99fac0..6a20d3e05e8ceef8752e1a461e91cd1d373f8a89 100644 +index d57e814fd353903ed6fcec59802acb9c3455bd96..7db2f7b6da0bd32c8d0655ba4ff2c15b5fb2cd87 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2403,7 +2403,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf. +@@ -2415,7 +2415,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf. @Override public LevelEntityGetter getEntities() { @@ -296,7 +296,7 @@ index fef97efb91a06722c895583ea5cc54cdee99fac0..6a20d3e05e8ceef8752e1a461e91cd1d } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 52c636591a8ee7ef1df532a6a7311f4ee39f1f63..e80b13cd0c0efe10becd6379fe98c67b2e4c9adf 100644 +index 846ddd4fcbb14db6f3eac9169de6850c18db3d94..b36da9d81f0bfd8841f608a3f822bc3b9f61dc86 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1816,7 +1816,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0104-Nitori-Async-playerdata-Save.patch b/patches/server/0109-Nitori-Async-playerdata-Save.patch similarity index 100% rename from patches/server/0104-Nitori-Async-playerdata-Save.patch rename to patches/server/0109-Nitori-Async-playerdata-Save.patch diff --git a/patches/server/0105-Change-max-stack-count.patch b/patches/server/0110-Change-max-stack-count.patch similarity index 100% rename from patches/server/0105-Change-max-stack-count.patch rename to patches/server/0110-Change-max-stack-count.patch diff --git a/patches/server/0106-Remove-stream-and-double-iteration-in-enough-deep-sl.patch b/patches/server/0111-Remove-stream-and-double-iteration-in-enough-deep-sl.patch similarity index 100% rename from patches/server/0106-Remove-stream-and-double-iteration-in-enough-deep-sl.patch rename to patches/server/0111-Remove-stream-and-double-iteration-in-enough-deep-sl.patch