Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 20:46:59 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3812: Workbench from Bukkit.createInventory does not update

Browse Source
This commit is contained in:
md_5 2018-02-12 08:43:11 +11:00
parent 9ab298de7b
commit 49ecc7c7a2
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
View File

@ -17,12 +17,12 @@ import net.minecraft.server.ContainerEnchantTable;
import net.minecraft.server.ContainerFurnace; import net.minecraft.server.ContainerFurnace;
import net.minecraft.server.ContainerHopper; import net.minecraft.server.ContainerHopper;
import net.minecraft.server.ContainerShulkerBox; import net.minecraft.server.ContainerShulkerBox;
import net.minecraft.server.ContainerWorkbench;
import net.minecraft.server.EntityHuman; import net.minecraft.server.EntityHuman;
import net.minecraft.server.IInventory; import net.minecraft.server.IInventory;
import net.minecraft.server.ItemStack; import net.minecraft.server.ItemStack;
import net.minecraft.server.PacketPlayOutOpenWindow; import net.minecraft.server.PacketPlayOutOpenWindow;
import net.minecraft.server.PlayerInventory; import net.minecraft.server.PlayerInventory;
import net.minecraft.server.Slot;
public class CraftContainer extends Container { public class CraftContainer extends Container {
@ -149,7 +149,7 @@ public class CraftContainer extends Container {
break; break;
case CRAFTING: // TODO: This should be an error? case CRAFTING: // TODO: This should be an error?
case WORKBENCH: case WORKBENCH:
delegate = new ContainerWorkbench(bottom, entityhuman.world, entityhuman.getChunkCoordinates()); setupWorkbench(top, bottom); // SPIGOT-3812 - manually set up slots so we can use the delegated inventory and not the automatically created one
break; break;
case ENCHANTING: case ENCHANTING:
delegate = new ContainerEnchantTable(bottom, entityhuman.world, entityhuman.getChunkCoordinates()); delegate = new ContainerEnchantTable(bottom, entityhuman.world, entityhuman.getChunkCoordinates());
@ -177,6 +177,31 @@ public class CraftContainer extends Container {
} }
} }
private void setupWorkbench(IInventory top, IInventory bottom) {
// This code copied from ContainerWorkbench
this.a(new Slot(top, 0, 124, 35));
int row;
int col;
for (row = 0; row < 3; ++row) {
for (col = 0; col < 3; ++col) {
this.a(new Slot(top, 1 + col + row * 3, 30 + col * 18, 17 + row * 18));
}
}
for (row = 0; row < 3; ++row) {
for (col = 0; col < 9; ++col) {
this.a(new Slot(bottom, col + row * 9 + 9, 8 + col * 18, 84 + row * 18));
}
}
for (col = 0; col < 9; ++col) {
this.a(new Slot(bottom, col, 8 + col * 18, 142));
}
// End copy from ContainerWorkbench
}
@Override @Override
public ItemStack shiftClick(EntityHuman entityhuman, int i) { public ItemStack shiftClick(EntityHuman entityhuman, int i) {
return (delegate != null) ? delegate.shiftClick(entityhuman, i) : super.shiftClick(entityhuman, i); return (delegate != null) ? delegate.shiftClick(entityhuman, i) : super.shiftClick(entityhuman, i);