SPIGOT-4598: Shift click on custom workbench inventory causes crash

This commit is contained in:
md_5 2019-01-30 11:10:04 +11:00
parent a65b73ad9d
commit 1734f378f7

View File

@ -17,6 +17,7 @@ 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;
@ -175,6 +176,11 @@ public class CraftContainer extends Container {
this.items = delegate.items; this.items = delegate.items;
this.slots = delegate.slots; this.slots = delegate.slots;
} }
// SPIGOT-4598 - we should still delegate the shift click handler
if (cachedType == InventoryType.WORKBENCH) {
delegate = new ContainerWorkbench(bottom, entityhuman.world, entityhuman.getChunkCoordinates());
}
} }
private void setupWorkbench(IInventory top, IInventory bottom) { private void setupWorkbench(IInventory top, IInventory bottom) {