mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
--- a/net/minecraft/server/ContainerWorkbench.java
|
|
+++ b/net/minecraft/server/ContainerWorkbench.java
|
|
@@ -1,14 +1,29 @@
|
|
package net.minecraft.server;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryCrafting;
|
|
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
|
|
+// CraftBukkit end
|
|
+
|
|
public class ContainerWorkbench extends Container {
|
|
|
|
- public InventoryCrafting craftInventory = new InventoryCrafting(this, 3, 3);
|
|
- public InventoryCraftResult resultInventory = new InventoryCraftResult();
|
|
+ public InventoryCrafting craftInventory; // CraftBukkit - move initialization into constructor
|
|
+ public InventoryCraftResult resultInventory; // CraftBukkit - move initialization into constructor
|
|
private final World g;
|
|
private final BlockPosition h;
|
|
private final EntityHuman i;
|
|
+ // CraftBukkit start
|
|
+ private CraftInventoryView bukkitEntity = null;
|
|
+ private PlayerInventory player;
|
|
+ // CraftBukkit end
|
|
|
|
public ContainerWorkbench(PlayerInventory playerinventory, World world, BlockPosition blockposition) {
|
|
+ // CraftBukkit start - Switched order of IInventory construction and stored player
|
|
+ this.resultInventory = new InventoryCraftResult();
|
|
+ this.craftInventory = new InventoryCrafting(this, 3, 3, playerinventory.player); // CraftBukkit - pass player
|
|
+ this.craftInventory.resultInventory = this.resultInventory;
|
|
+ this.player = playerinventory;
|
|
+ // CraftBukkit end
|
|
this.g = world;
|
|
this.h = blockposition;
|
|
this.i = playerinventory.player;
|
|
@@ -47,6 +62,7 @@
|
|
}
|
|
|
|
public boolean canUse(EntityHuman entityhuman) {
|
|
+ if (!this.checkReachable) return true; // CraftBukkit
|
|
return this.g.getType(this.h).getBlock() != Blocks.CRAFTING_TABLE ? false : entityhuman.d((double) this.h.getX() + 0.5D, (double) this.h.getY() + 0.5D, (double) this.h.getZ() + 0.5D) <= 64.0D;
|
|
}
|
|
|
|
@@ -100,4 +116,17 @@
|
|
public boolean a(ItemStack itemstack, Slot slot) {
|
|
return slot.inventory != this.resultInventory && super.a(itemstack, slot);
|
|
}
|
|
+
|
|
+ // CraftBukkit start
|
|
+ @Override
|
|
+ public CraftInventoryView getBukkitView() {
|
|
+ if (bukkitEntity != null) {
|
|
+ return bukkitEntity;
|
|
+ }
|
|
+
|
|
+ CraftInventoryCrafting inventory = new CraftInventoryCrafting(this.craftInventory, this.resultInventory);
|
|
+ bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), inventory, this);
|
|
+ return bukkitEntity;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|