diff options
| author | md_5 <git@md-5.net> | 2014-12-12 11:05:04 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2014-12-12 11:05:04 +1100 |
| commit | 1f8414b489ed7c84f5e101a420c4254267699507 (patch) | |
| tree | 61a6cbb658ba677999d033c8c707bd831507ac30 /nms-patches/ContainerWorkbench.patch | |
| parent | 45cd36e553dc7bfa501ec2efca1c9e2f36c370a2 (diff) | |
| download | craftbukkit-1f8414b489ed7c84f5e101a420c4254267699507.tar craftbukkit-1f8414b489ed7c84f5e101a420c4254267699507.tar.gz craftbukkit-1f8414b489ed7c84f5e101a420c4254267699507.tar.lz craftbukkit-1f8414b489ed7c84f5e101a420c4254267699507.tar.xz craftbukkit-1f8414b489ed7c84f5e101a420c4254267699507.zip | |
Rebuilt patches
Diffstat (limited to 'nms-patches/ContainerWorkbench.patch')
| -rw-r--r-- | nms-patches/ContainerWorkbench.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nms-patches/ContainerWorkbench.patch b/nms-patches/ContainerWorkbench.patch index 512ff3fc..ea1978e9 100644 --- a/nms-patches/ContainerWorkbench.patch +++ b/nms-patches/ContainerWorkbench.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/ContainerWorkbench.java 2014-12-09 20:39:54.821706281 +0100 -+++ src/main/java/net/minecraft/server/ContainerWorkbench.java 2014-12-09 20:39:42.000000000 +0100 +--- ../work/decompile-8eb82bde/net/minecraft/server/ContainerWorkbench.java 2014-12-12 11:04:49.302794059 +1100 ++++ src/main/java/net/minecraft/server/ContainerWorkbench.java 2014-12-12 11:04:29.771003013 +1100 @@ -1,13 +1,28 @@ package net.minecraft.server; @@ -31,7 +31,7 @@ this.g = world; this.h = blockposition; this.a((Slot) (new SlotResult(playerinventory.player, this.craftInventory, this.resultInventory, 0, 124, 35))); -@@ -35,7 +50,20 @@ +@@ -35,7 +50,21 @@ } public void a(IInventory iinventory) { @@ -44,16 +44,17 @@ + if (super.listeners.size() < 1) { + return; + } ++ // See CraftBukkit PR #39 + if (craftResult != null && craftResult.getItem() == Items.FILLED_MAP) { + return; -+ } ++ } + EntityPlayer player = (EntityPlayer) super.listeners.get(0); // TODO: Is this _always_ correct? Seems like it. + player.playerConnection.sendPacket(new PacketPlayOutSetSlot(player.activeContainer.windowId, 0, craftResult)); + // CraftBukkit end } public void b(EntityHuman entityhuman) { -@@ -53,6 +81,7 @@ +@@ -53,6 +82,7 @@ } public boolean a(EntityHuman entityhuman) { @@ -61,7 +62,7 @@ return this.g.getType(this.h).getBlock() != Blocks.CRAFTING_TABLE ? false : entityhuman.e((double) this.h.getX() + 0.5D, (double) this.h.getY() + 0.5D, (double) this.h.getZ() + 0.5D) <= 64.0D; } -@@ -101,4 +130,17 @@ +@@ -101,4 +131,17 @@ public boolean a(ItemStack itemstack, Slot slot) { return slot.inventory != this.resultInventory && super.a(itemstack, slot); } |