Rename revision 2

2 files changed, 11 insertions, 11 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 9c1cc854..63e1d1b9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -41,7 +41,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
         }
 
         if (entity instanceof EntityPlayer && health == 0) {
-            ((EntityPlayer) entity).die(DamageSource.j);
+            ((EntityPlayer) entity).die(DamageSource.GENERIC);
         }
 
         getHandle().health = health;
@@ -176,16 +176,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
     }
 
     public void damage(int amount) {
-        entity.damageEntity(DamageSource.j, amount);
+        entity.damageEntity(DamageSource.GENERIC, amount);
     }
 
     public void damage(int amount, org.bukkit.entity.Entity source) {
-        DamageSource reason = DamageSource.a.j;
+        DamageSource reason = DamageSource.GENERIC;
 
         if (source instanceof HumanEntity) {
-            reason = DamageSource.b(((CraftHumanEntity)source).getHandle());
+            reason = DamageSource.playerAttack(((CraftHumanEntity)source).getHandle());
         } else if (source instanceof LivingEntity) {
-            reason = DamageSource.a(((CraftLivingEntity)source).getHandle());
+            reason = DamageSource.mobAttack(((CraftLivingEntity)source).getHandle());
         }
 
         entity.damageEntity(reason, amount);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 0be60026..5fe614fc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -426,26 +426,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     }
 
     public float getExhaustion() {
-        return getHandle().V().c;
+        return getHandle().getFoodData().exhaustionLevel;
     }
 
     public void setExhaustion(float value) {
-        getHandle().V().c = value;
+        getHandle().getFoodData().exhaustionLevel = value;
     }
 
     public float getSaturation() {
-        return getHandle().V().b;
+        return getHandle().getFoodData().saturationLevel;
     }
 
     public void setSaturation(float value) {
-        getHandle().V().b = value;
+        getHandle().getFoodData().saturationLevel = value;
     }
 
     public int getFoodLevel() {
-        return getHandle().V().a;
+        return getHandle().getFoodData().foodLevel;
     }
 
     public void setFoodLevel(int value) {
-        getHandle().V().a = value;
+        getHandle().getFoodData().foodLevel = value;
     }
 }