diff options
| author | Travis Watkins <amaranth@ubuntu.com> | 2014-06-26 13:05:08 -0500 |
|---|---|---|
| committer | Travis Watkins <amaranth@ubuntu.com> | 2014-07-08 14:31:10 -0500 |
| commit | dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00 (patch) | |
| tree | 062b1b273d0e0f337fde6b79f9377519d85c48c5 /src/main/java/net/minecraft/server/PacketDataSerializer.java | |
| parent | a8628fd645e12ec22bc525f49dd25f68d094f3ef (diff) | |
| download | craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.gz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.lz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.xz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.zip | |
Update CraftBukkit to Minecraft 1.7.10
Diffstat (limited to 'src/main/java/net/minecraft/server/PacketDataSerializer.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/PacketDataSerializer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java index f6f870fd..8d3cf1f9 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -82,7 +82,7 @@ public class PacketDataSerializer extends ByteBuf { if (itemstack == null || itemstack.getItem() == null) { // CraftBukkit - NPE fix itemstack.getItem() this.writeShort(-1); } else { - this.writeShort(Item.b(itemstack.getItem())); + this.writeShort(Item.getId(itemstack.getItem())); this.writeByte(itemstack.count); this.writeShort(itemstack.getData()); NBTTagCompound nbttagcompound = null; @@ -103,7 +103,7 @@ public class PacketDataSerializer extends ByteBuf { byte b0 = this.readByte(); short short2 = this.readShort(); - itemstack = new ItemStack(Item.d(short1), b0, short2); + itemstack = new ItemStack(Item.getById(short1), b0, short2); itemstack.tag = this.b(); // CraftBukkit start if (itemstack.tag != null) { |