diff --git a/patches/server/0090-Airplane-Remove-streams-in-PoiCompetitorScan.patch b/patches/server/0080-Airplane-Remove-stream-in-PoiCompetitorScan.patch similarity index 98% rename from patches/server/0090-Airplane-Remove-streams-in-PoiCompetitorScan.patch rename to patches/server/0080-Airplane-Remove-stream-in-PoiCompetitorScan.patch index 93596d7d..62210652 100644 --- a/patches/server/0090-Airplane-Remove-streams-in-PoiCompetitorScan.patch +++ b/patches/server/0080-Airplane-Remove-stream-in-PoiCompetitorScan.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 22 Jul 2024 10:56:59 +0800 -Subject: [PATCH] Airplane: Remove streams in PoiCompetitorScan +Subject: [PATCH] Airplane: Remove stream in PoiCompetitorScan Original license: GPLv3 Original project: https://github.com/TECHNOVE/Airplane-Experimental diff --git a/patches/server/0080-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/patches/server/0081-Remove-stream-in-BlockBehaviour-cache-blockstate.patch similarity index 100% rename from patches/server/0080-Remove-stream-in-BlockBehaviour-cache-blockstate.patch rename to patches/server/0081-Remove-stream-in-BlockBehaviour-cache-blockstate.patch diff --git a/patches/server/0082-Remove-stream-in-RecipeManager-getRecipeFor.patch b/patches/server/0082-Remove-stream-in-RecipeManager-getRecipeFor.patch new file mode 100644 index 00000000..8af10912 --- /dev/null +++ b/patches/server/0082-Remove-stream-in-RecipeManager-getRecipeFor.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> +Date: Fri, 23 Aug 2024 20:22:00 -0400 +Subject: [PATCH] Remove stream in RecipeManager getRecipeFor + + +diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java +index febf87b14125925f548393360e89077329a6c522..de7537c4eacf6fa549f74fd329102a2e4865194a 100644 +--- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java ++++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java +@@ -118,9 +118,16 @@ public class RecipeManager extends SimpleJsonResourceReloadListener { + return Optional.of(recipe); + } else { + // CraftBukkit start +- List> list = this.byType(type).stream().filter((recipeholder1) -> { +- return recipeholder1.value().matches(input, world); +- }).toList(); ++ // Leaf start - Remove streams in RecipeManager getRecipeFor ++ List> list = new java.util.ArrayList<>(); ++ ++ for (RecipeHolder recipeholder1 : this.byType(type)) { ++ if (recipeholder1.value().matches(input, world)) { ++ list.add(recipeholder1); ++ } ++ } ++ // Leaf end - Remove streams in RecipeManager getRecipeFor ++ + return list.isEmpty() ? Optional.empty() : Optional.of(list.getLast()); // CraftBukkit - SPIGOT-4638: last recipe gets priority + // CraftBukkit end + } diff --git a/patches/server/0081-Reduce-worldgen-allocations.patch b/patches/server/0083-Reduce-worldgen-allocations.patch similarity index 100% rename from patches/server/0081-Reduce-worldgen-allocations.patch rename to patches/server/0083-Reduce-worldgen-allocations.patch diff --git a/patches/server/0082-Fix-MC-183518.patch b/patches/server/0084-Fix-MC-183518.patch similarity index 100% rename from patches/server/0082-Fix-MC-183518.patch rename to patches/server/0084-Fix-MC-183518.patch diff --git a/patches/server/0083-Use-caffeine-cache-kickPermission-instead-of-using-g.patch b/patches/server/0085-Use-caffeine-cache-kickPermission-instead-of-using-g.patch similarity index 96% rename from patches/server/0083-Use-caffeine-cache-kickPermission-instead-of-using-g.patch rename to patches/server/0085-Use-caffeine-cache-kickPermission-instead-of-using-g.patch index 335800d1..fd2863b6 100644 --- a/patches/server/0083-Use-caffeine-cache-kickPermission-instead-of-using-g.patch +++ b/patches/server/0085-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 212074a4e26fd124705bbd4ac7bb4e25f3cbf2f9..091580c23138fc260f3aa898aa0f4a247c705293 100644 +index 3f123bbed6522c30d0319c465fce6830d7c274d1..906c4e90997fbcdaf7af2a5077a7a50e25d7107f 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/0084-Do-not-place-player-if-the-server-is-full.patch b/patches/server/0086-Do-not-place-player-if-the-server-is-full.patch similarity index 96% rename from patches/server/0084-Do-not-place-player-if-the-server-is-full.patch rename to patches/server/0086-Do-not-place-player-if-the-server-is-full.patch index eb6f7f0e..5d93fc98 100644 --- a/patches/server/0084-Do-not-place-player-if-the-server-is-full.patch +++ b/patches/server/0086-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 bd1b6f2aee3d79d9c6e21af6518bbf1800861a49..facbb85c4bcf46f85bc0088f28e4ffa7745719e4 100644 +index 9d2faacd5c9c6e5439c6b8b2e2f7cb2bab4ad8f8..e204f4783ffccc785f8d302019491549184580d3 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -280,6 +280,13 @@ public abstract class PlayerList { diff --git a/patches/server/0085-Fix-MC-200418.patch b/patches/server/0087-Fix-MC-200418.patch similarity index 100% rename from patches/server/0085-Fix-MC-200418.patch rename to patches/server/0087-Fix-MC-200418.patch diff --git a/patches/server/0086-Fix-MC-119417.patch b/patches/server/0088-Fix-MC-119417.patch similarity index 100% rename from patches/server/0086-Fix-MC-119417.patch rename to patches/server/0088-Fix-MC-119417.patch diff --git a/patches/server/0087-Fix-MC-223153.patch b/patches/server/0089-Fix-MC-223153.patch similarity index 100% rename from patches/server/0087-Fix-MC-223153.patch rename to patches/server/0089-Fix-MC-223153.patch diff --git a/patches/server/0088-Optimize-LeavesProtocolManager-init-protocol.patch b/patches/server/0090-Optimize-LeavesProtocolManager-init-protocol.patch similarity index 100% rename from patches/server/0088-Optimize-LeavesProtocolManager-init-protocol.patch rename to patches/server/0090-Optimize-LeavesProtocolManager-init-protocol.patch diff --git a/patches/server/0089-Optimize-check-nearby-fire-or-lava-on-entity-move.patch b/patches/server/0091-Optimize-check-nearby-fire-or-lava-on-entity-move.patch similarity index 100% rename from patches/server/0089-Optimize-check-nearby-fire-or-lava-on-entity-move.patch rename to patches/server/0091-Optimize-check-nearby-fire-or-lava-on-entity-move.patch diff --git a/patches/server/0091-Cache-CraftEntityType-minecraftToBukkit-convert.patch b/patches/server/0092-Cache-CraftEntityType-minecraftToBukkit-convert.patch similarity index 100% rename from patches/server/0091-Cache-CraftEntityType-minecraftToBukkit-convert.patch rename to patches/server/0092-Cache-CraftEntityType-minecraftToBukkit-convert.patch diff --git a/patches/server/0092-Configurable-player-knockback-zombie.patch b/patches/server/0093-Configurable-player-knockback-zombie.patch similarity index 100% rename from patches/server/0092-Configurable-player-knockback-zombie.patch rename to patches/server/0093-Configurable-player-knockback-zombie.patch diff --git a/patches/server/0093-Hide-specified-item-components-to-clients.patch b/patches/server/0094-Hide-specified-item-components-to-clients.patch similarity index 100% rename from patches/server/0093-Hide-specified-item-components-to-clients.patch rename to patches/server/0094-Hide-specified-item-components-to-clients.patch diff --git a/patches/server/0094-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch b/patches/server/0095-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch similarity index 97% rename from patches/server/0094-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch rename to patches/server/0095-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch index fb2e4b35..a10f159a 100644 --- a/patches/server/0094-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch +++ b/patches/server/0095-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch @@ -8,7 +8,7 @@ Original project: https://github.com/PaperMC/Paper Paper pull request: https://github.com/PaperMC/Paper/pull/10990 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 2002aef0b01de0b6f10478a9dd08778243bceb3d..019eddea2bb4a506b97c6591a26599b41988df84 100644 +index 96a165dc8a0ec8cb0e7828d2169b2efc51c638c7..41e1df6e4d7e859285ce482df841b0ac07338272 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -239,6 +239,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab diff --git a/patches/server/0095-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/patches/server/0096-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch similarity index 100% rename from patches/server/0095-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch rename to patches/server/0096-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch diff --git a/patches/server/0096-Paper-PR-Throttle-failed-spawn-attempts.patch b/patches/server/0097-Paper-PR-Throttle-failed-spawn-attempts.patch similarity index 100% rename from patches/server/0096-Paper-PR-Throttle-failed-spawn-attempts.patch rename to patches/server/0097-Paper-PR-Throttle-failed-spawn-attempts.patch diff --git a/patches/server/0097-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/patches/server/0098-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch similarity index 100% rename from patches/server/0097-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch rename to patches/server/0098-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch diff --git a/patches/server/0098-Dont-send-useless-entity-packets.patch b/patches/server/0099-Dont-send-useless-entity-packets.patch similarity index 100% rename from patches/server/0098-Dont-send-useless-entity-packets.patch rename to patches/server/0099-Dont-send-useless-entity-packets.patch