diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 17:36:27 +0100 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 17:39:17 +0100 |
commit | 2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb (patch) | |
tree | 412002b4ee8104908e0d71a996500ae188860ad4 /src/main/java/net/minecraft/server/EntityPlayer.java | |
parent | 3c5632de31b923c8eaefae130f042a4d24566881 (diff) | |
download | craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar.gz craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar.lz craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar.xz craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.zip |
Rename revision 2
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPlayer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityPlayer.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index b49ed108..74476d7d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -99,7 +99,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.itemInWorldManager = new ItemInWorldManager((WorldServer) world); this.itemInWorldManager.player = this; this.itemInWorldManager.a(oldMode); - this.m = new FoodMetaData(); + this.foodData = new FoodMetaData(); // CraftBukkit end } @@ -139,7 +139,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void die(DamageSource damagesource) { - this.b.serverConfigurationManager.sendAll(new Packet3Chat(damagesource.a((EntityHuman) this))); + this.b.serverConfigurationManager.sendAll(new Packet3Chat(damagesource.a(this))); // CraftBukkit start java.util.List<org.bukkit.inventory.ItemStack> loot = new java.util.ArrayList<org.bukkit.inventory.ItemStack>(); @@ -184,7 +184,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } else { // CraftBukkit - this.b.pvpMode -> this.world.pvpMode if (!this.world.pvpMode && damagesource instanceof EntityDamageSource) { - Entity entity = damagesource.a(); + Entity entity = damagesource.getEntity(); if (entity instanceof EntityHuman) { return false; @@ -300,11 +300,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { --this.H; } - if (this.health != this.cb || this.cc != this.m.a() || this.m.c() == 0.0F != this.cd) { - this.netServerHandler.sendPacket(new Packet8UpdateHealth(this.health, this.m.a(), this.m.c())); + if (this.health != this.cb || this.cc != this.foodData.a() || this.foodData.c() == 0.0F != this.cd) { + this.netServerHandler.sendPacket(new Packet8UpdateHealth(this.health, this.foodData.a(), this.foodData.c())); this.cb = this.health; - this.cc = this.m.a(); - this.cd = this.m.c() == 0.0F; + this.cc = this.foodData.a(); + this.cd = this.foodData.c() == 0.0F; } if (this.expTotal != this.ce) { |