SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.21.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-10-23 02:15:00 +11:00
parent 2c4beb962b
commit d3a23f42c3
522 changed files with 8501 additions and 6477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
paper-server/nms-patches/net/minecraft/stats/RecipeBookServer.patch
View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/stats/RecipeBookServer.java
+++ b/net/minecraft/stats/RecipeBookServer.java
@@ -20,6 +20,8 @@
import net.minecraft.world.item.crafting.RecipeHolder;
@@ -29,6 +29,8 @@
import net.minecraft.world.item.crafting.display.RecipeDisplayId;
import org.slf4j.Logger;
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
@@ -9,20 +9,30 @@
public class RecipeBookServer extends RecipeBook {
public static final String RECIPE_BOOK_TAG = "recipeBook";
@@ -36,7 +38,7 @@
@@ -72,7 +74,7 @@
RecipeHolder<?> recipeholder = (RecipeHolder) iterator.next();
MinecraftKey minecraftkey = recipeholder.id();
ResourceKey<IRecipe<?>> resourcekey = recipeholder.id();
- if (!this.known.contains(minecraftkey) && !recipeholder.value().isSpecial()) {
+ if (!this.known.contains(minecraftkey) && !recipeholder.value().isSpecial() && CraftEventFactory.handlePlayerRecipeListUpdateEvent(entityplayer, minecraftkey)) { // CraftBukkit
this.add(minecraftkey);
this.addHighlight(minecraftkey);
list.add(minecraftkey);
@@ -73,6 +75,7 @@
}
- 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 @@
}
}
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()));
}
- 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));
}