diff options
author | feildmaster <admin@feildmaster.com> | 2013-09-19 13:25:08 -0500 |
---|---|---|
committer | feildmaster <admin@feildmaster.com> | 2013-09-19 20:01:02 -0500 |
commit | dcb9d6a5ef2d572b041696d5728f660aa8549e47 (patch) | |
tree | 5b81d2ea9db695ea713deb9a47b6c867fa5219b2 /src/main/java/net/minecraft/server/EntityPotion.java | |
parent | e20ef1f60600467077bba06d36585ae9d3c5fb27 (diff) | |
download | craftbukkit-dcb9d6a5ef2d572b041696d5728f660aa8549e47.tar craftbukkit-dcb9d6a5ef2d572b041696d5728f660aa8549e47.tar.gz craftbukkit-dcb9d6a5ef2d572b041696d5728f660aa8549e47.tar.lz craftbukkit-dcb9d6a5ef2d572b041696d5728f660aa8549e47.tar.xz craftbukkit-dcb9d6a5ef2d572b041696d5728f660aa8549e47.zip |
Update CraftBukkit to 1.6.4
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPotion.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityPotion.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java index a4330c74..cde3d7c3 100644 --- a/src/main/java/net/minecraft/server/EntityPotion.java +++ b/src/main/java/net/minecraft/server/EntityPotion.java @@ -12,7 +12,7 @@ import org.bukkit.entity.LivingEntity; public class EntityPotion extends EntityProjectile { - public ItemStack c; // CraftBukkit private --> public + public ItemStack item; // CraftBukkit private --> public public EntityPotion(World world) { super(world); @@ -24,12 +24,12 @@ public class EntityPotion extends EntityProjectile { public EntityPotion(World world, EntityLiving entityliving, ItemStack itemstack) { super(world, entityliving); - this.c = itemstack; + this.item = itemstack; } public EntityPotion(World world, double d0, double d1, double d2, ItemStack itemstack) { super(world, d0, d1, d2); - this.c = itemstack; + this.item = itemstack; } protected float e() { @@ -45,24 +45,24 @@ public class EntityPotion extends EntityProjectile { } public void setPotionValue(int i) { - if (this.c == null) { - this.c = new ItemStack(Item.POTION, 1, 0); + if (this.item == null) { + this.item = new ItemStack(Item.POTION, 1, 0); } - this.c.setData(i); + this.item.setData(i); } public int getPotionValue() { - if (this.c == null) { - this.c = new ItemStack(Item.POTION, 1, 0); + if (this.item == null) { + this.item = new ItemStack(Item.POTION, 1, 0); } - return this.c.getData(); + return this.item.getData(); } protected void a(MovingObjectPosition movingobjectposition) { if (!this.world.isStatic) { - List list = Item.POTION.g(this.c); + List list = Item.POTION.g(this.item); if (true || list != null && !list.isEmpty()) { // CraftBukkit - Call event even if no effects to apply AxisAlignedBB axisalignedbb = this.boundingBox.grow(4.0D, 2.0D, 4.0D); @@ -138,20 +138,20 @@ public class EntityPotion extends EntityProjectile { public void a(NBTTagCompound nbttagcompound) { super.a(nbttagcompound); if (nbttagcompound.hasKey("Potion")) { - this.c = ItemStack.createStack(nbttagcompound.getCompound("Potion")); + this.item = ItemStack.createStack(nbttagcompound.getCompound("Potion")); } else { this.setPotionValue(nbttagcompound.getInt("potionValue")); } - if (this.c == null) { + if (this.item == null) { this.die(); } } public void b(NBTTagCompound nbttagcompound) { super.b(nbttagcompound); - if (this.c != null) { - nbttagcompound.setCompound("Potion", this.c.save(new NBTTagCompound())); + if (this.item != null) { + nbttagcompound.setCompound("Potion", this.item.save(new NBTTagCompound())); } } } |