mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-21 07:59:26 +00:00
Remove stream in RecipeManager getRecipeFor
This commit is contained in:
@@ -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
|
||||
@@ -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<RecipeHolder<T>> list = this.byType(type).stream().filter((recipeholder1) -> {
|
||||
- return recipeholder1.value().matches(input, world);
|
||||
- }).toList();
|
||||
+ // Leaf start - Remove streams in RecipeManager getRecipeFor
|
||||
+ List<RecipeHolder<T>> list = new java.util.ArrayList<>();
|
||||
+
|
||||
+ for (RecipeHolder<T> 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
|
||||
}
|
||||
@@ -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
|
||||
@@ -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 {
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user