PaperMC/paper-server/nms-patches/net/minecraft/stats/RecipeBookServer.patch

29 lines
1.3 KiB
Diff
Raw Normal View History

2021-03-15 23:00:00 +01:00
--- a/net/minecraft/stats/RecipeBookServer.java
+++ b/net/minecraft/stats/RecipeBookServer.java
@@ -20,6 +20,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+
public class RecipeBookServer extends RecipeBook {
public static final String RECIPE_BOOK_TAG = "recipeBook";
@@ -36,7 +38,7 @@
IRecipe<?> irecipe = (IRecipe) iterator.next();
MinecraftKey minecraftkey = irecipe.getId();
- if (!this.known.contains(minecraftkey) && !irecipe.isSpecial()) {
+ if (!this.known.contains(minecraftkey) && !irecipe.isSpecial() && CraftEventFactory.handlePlayerRecipeListUpdateEvent(entityplayer, minecraftkey)) { // CraftBukkit
this.add(minecraftkey);
this.addHighlight(minecraftkey);
list.add(minecraftkey);
@@ -70,6 +72,7 @@
}
private void sendRecipes(PacketPlayOutRecipes.Action packetplayoutrecipes_action, EntityPlayer entityplayer, List<MinecraftKey> list) {
+ if (entityplayer.connection == null) return; // SPIGOT-4478 during PlayerLoginEvent
entityplayer.connection.send(new PacketPlayOutRecipes(packetplayoutrecipes_action, list, Collections.emptyList(), this.getBookSettings()));
}