diff options
| author | Wesley Wolfe <weswolf@aol.com> | 2012-12-17 01:31:41 -0600 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2012-12-17 01:31:41 -0600 |
| commit | 78f48258d8ab491065498492588acc5287a6fb6c (patch) | |
| tree | 11027439669a05c335fc6cb07c12a82b9c551f31 /src/main/java/net/minecraft/server/NetServerHandler.java | |
| parent | d20d4dc43aaa74fba457c44994cda8180523c9db (diff) | |
| download | craftbukkit-78f48258d8ab491065498492588acc5287a6fb6c.tar craftbukkit-78f48258d8ab491065498492588acc5287a6fb6c.tar.gz craftbukkit-78f48258d8ab491065498492588acc5287a6fb6c.tar.lz craftbukkit-78f48258d8ab491065498492588acc5287a6fb6c.tar.xz craftbukkit-78f48258d8ab491065498492588acc5287a6fb6c.zip | |
Implement ItemFactory and ItemMeta values. Adds BUKKIT-15
Diffstat (limited to 'src/main/java/net/minecraft/server/NetServerHandler.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/NetServerHandler.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 084d0aff..88afae43 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -1230,11 +1230,11 @@ public class NetServerHandler extends NetHandler { if (cursor == null) { this.player.inventory.setCarried((ItemStack) null); } else { - this.player.inventory.setCarried(CraftItemStack.createNMSItemStack(cursor)); + this.player.inventory.setCarried(CraftItemStack.asNMSCopy(cursor)); } org.bukkit.inventory.ItemStack item = event.getCurrentItem(); if (item != null) { - itemstack = CraftItemStack.createNMSItemStack(item); + itemstack = CraftItemStack.asNMSCopy(item); if (packet102windowclick.slot == -999) { this.player.drop(itemstack); } else { @@ -1307,16 +1307,16 @@ public class NetServerHandler extends NetHandler { if (item == null) { this.player.defaultContainer.setItem(packet107setcreativeslot.slot, (ItemStack) null); } else { - this.player.defaultContainer.setItem(packet107setcreativeslot.slot, CraftItemStack.createNMSItemStack(item)); + this.player.defaultContainer.setItem(packet107setcreativeslot.slot, CraftItemStack.asNMSCopy(item)); } } else if (item != null) { - this.player.drop(CraftItemStack.createNMSItemStack(item)); + this.player.drop(CraftItemStack.asNMSCopy(item)); } return; case DENY: // TODO: Will this actually work? if (packet107setcreativeslot.slot > -1) { - this.player.netServerHandler.sendPacket(new Packet103SetSlot(this.player.defaultContainer.windowId, packet107setcreativeslot.slot, CraftItemStack.createNMSItemStack(item))); + this.player.netServerHandler.sendPacket(new Packet103SetSlot(this.player.defaultContainer.windowId, packet107setcreativeslot.slot, CraftItemStack.asNMSCopy(item))); } return; case DEFAULT: |