Move CraftBukkit per-file patches

By: Initial <noreply+automated@papermc.io>
This commit is contained in:
CraftBukkit/Spigot
2024-12-11 22:26:36 +01:00
parent a4de181b77
commit a265d64138
583 changed files with 71 additions and 857 deletions

View File

@@ -0,0 +1,38 @@
--- a/net/minecraft/stats/RecipeBookServer.java
+++ b/net/minecraft/stats/RecipeBookServer.java
@@ -29,6 +29,8 @@
import net.minecraft.world.item.crafting.display.RecipeDisplayId;
import org.slf4j.Logger;
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+
public class RecipeBookServer extends RecipeBook {
public static final String RECIPE_BOOK_TAG = "recipeBook";
@@ -72,7 +74,7 @@
RecipeHolder<?> recipeholder = (RecipeHolder) iterator.next();
ResourceKey<IRecipe<?>> resourcekey = recipeholder.id();
- if (!this.known.contains(resourcekey) && !recipeholder.value().isSpecial()) {
+ if (!this.known.contains(resourcekey) && !recipeholder.value().isSpecial() && CraftEventFactory.handlePlayerRecipeListUpdateEvent(entityplayer, resourcekey.location())) { // CraftBukkit
this.add(resourcekey);
this.addHighlight(resourcekey);
this.displayResolver.displaysForRecipe(resourcekey, (recipedisplayentry) -> {
@@ -82,7 +84,7 @@
}
}
- if (!list.isEmpty()) {
+ if (!list.isEmpty() && entityplayer.connection != null) { // SPIGOT-4478 during PlayerLoginEvent
entityplayer.connection.send(new ClientboundRecipeBookAddPacket(list, false));
}
@@ -105,7 +107,7 @@
}
}
- if (!list.isEmpty()) {
+ if (!list.isEmpty() && entityplayer.connection != null) { // SPIGOT-4478 during PlayerLoginEvent
entityplayer.connection.send(new ClientboundRecipeBookRemovePacket(list));
}