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

41
paper-server/nms-patches/net/minecraft/world/inventory/AbstractCraftingMenu.patch Normal file
View File

@@ -0,0 +1,41 @@
--- a/net/minecraft/world/inventory/AbstractCraftingMenu.java
+++ b/net/minecraft/world/inventory/AbstractCraftingMenu.java
@@ -13,14 +13,17 @@
private final int width;
private final int height;
- public final InventoryCrafting craftSlots;
+ public final TransientCraftingContainer craftSlots; // CraftBukkit
public final InventoryCraftResult resultSlots = new InventoryCraftResult();
- public AbstractCraftingMenu(Containers<?> containers, int i, int j, int k) {
+ public AbstractCraftingMenu(Containers<?> containers, int i, int j, int k, PlayerInventory playerInventory) { // CraftBukkit
super(containers, i);
this.width = j;
this.height = k;
- this.craftSlots = new TransientCraftingContainer(this, j, k);
+ // CraftBukkit start
+ this.craftSlots = new TransientCraftingContainer(this, j, k, playerInventory.player); // CraftBukkit - pass player
+ this.craftSlots.resultInventory = this.resultSlots; // CraftBukkit - let InventoryCrafting know about its result slot
+ // CraftBukkit end
}
protected Slot addResultSlot(EntityHuman entityhuman, int i, int j) {
@@ -38,7 +41,7 @@
@Override
public ContainerRecipeBook.a handlePlacement(boolean flag, boolean flag1, RecipeHolder<?> recipeholder, WorldServer worldserver, PlayerInventory playerinventory) {
- RecipeHolder<RecipeCrafting> recipeholder1 = recipeholder;
+ RecipeHolder<RecipeCrafting> recipeholder1 = (RecipeHolder<RecipeCrafting>) recipeholder; // CraftBukkit - decompile error
this.beginPlacingRecipe();
@@ -65,7 +68,7 @@
}
}, this.width, this.height, list, list, playerinventory, recipeholder1, flag, flag1);
} finally {
- this.finishPlacingRecipe(worldserver, recipeholder);
+ this.finishPlacingRecipe(worldserver, recipeholder1); // CraftBukkit - decompile error
}
return containerrecipebook_a;