Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename revision 2

Browse Source
This commit is contained in:
Dinnerbone
2011-09-15 17:36:27 +01:00
parent 3c5632de31
commit 2b5a61f03d
29 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minecraft/server/EntityPlayer.java
View File

@@ -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) {