summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityItem.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/EntityItem.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/EntityItem.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityItem.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 8343ac9f..394bfbf6 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -54,7 +54,7 @@ public class EntityItem extends Entity {
}
protected void c() {
- this.getDataWatcher().a(10, 5);
+ this.getDataWatcher().add(10, 5);
}
public void h() {
@@ -164,7 +164,7 @@ public class EntityItem extends Entity {
this.age = 4800;
}
- public boolean M() {
+ public boolean N() {
return this.world.a(this.boundingBox, Material.WATER, (Entity) this);
}
@@ -178,7 +178,7 @@ public class EntityItem extends Entity {
} else if (this.getItemStack() != null && this.getItemStack().getItem() == Items.NETHER_STAR && damagesource.isExplosion()) {
return false;
} else {
- this.P();
+ this.Q();
this.e = (int) ((float) this.e - f);
if (this.e <= 0) {
this.die();
@@ -301,7 +301,7 @@ public class EntityItem extends Entity {
return LocaleI18n.get("item." + this.getItemStack().a());
}
- public boolean au() {
+ public boolean av() {
return false;
}
@@ -320,7 +320,7 @@ public class EntityItem extends Entity {
public void setItemStack(ItemStack itemstack) {
this.getDataWatcher().watch(10, itemstack);
- this.getDataWatcher().h(10);
+ this.getDataWatcher().update(10);
}
public String i() {