summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityItemFrame.java
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2014-06-26 13:05:08 -0500
committerTravis Watkins <amaranth@ubuntu.com>2014-07-08 14:31:10 -0500
commitdbb5e6e3cd35ca82efb39a44fcf6542733d2bc00 (patch)
tree062b1b273d0e0f337fde6b79f9377519d85c48c5 /src/main/java/net/minecraft/server/EntityItemFrame.java
parenta8628fd645e12ec22bc525f49dd25f68d094f3ef (diff)
downloadcraftbukkit-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/EntityItemFrame.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityItemFrame.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
index 6951c1d9..1edb6d31 100644
--- a/src/main/java/net/minecraft/server/EntityItemFrame.java
+++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
@@ -14,7 +14,7 @@ public class EntityItemFrame extends EntityHanging {
}
protected void c() {
- this.getDataWatcher().a(2, 5);
+ this.getDataWatcher().add(2, 5);
this.getDataWatcher().a(3, Byte.valueOf((byte) 0));
}
@@ -79,7 +79,7 @@ public class EntityItemFrame extends EntityHanging {
if (itemstack.getItem() == Items.MAP) {
WorldMap worldmap = ((ItemWorldMap) itemstack.getItem()).getSavedMap(itemstack, this.world);
- worldmap.g.remove("frame-" + this.getId());
+ worldmap.decorations.remove("frame-" + this.getId());
}
itemstack.a((EntityItemFrame) null);
@@ -98,7 +98,7 @@ public class EntityItemFrame extends EntityHanging {
}
this.getDataWatcher().watch(2, itemstack);
- this.getDataWatcher().h(2);
+ this.getDataWatcher().update(2);
}
public int getRotation() {
@@ -135,7 +135,7 @@ public class EntityItemFrame extends EntityHanging {
public boolean c(EntityHuman entityhuman) {
if (this.getItem() == null) {
- ItemStack itemstack = entityhuman.bd();
+ ItemStack itemstack = entityhuman.be();
if (itemstack != null && !this.world.isStatic) {
this.setItem(itemstack);