diff options
| author | Erik Broes <erikbroes@grum.nl> | 2011-05-14 16:29:42 +0200 |
|---|---|---|
| committer | Erik Broes <erikbroes@grum.nl> | 2011-05-15 13:41:46 +0200 |
| commit | 309846d732849b68e382c53bf3a0d7a6dfd82579 (patch) | |
| tree | 020932a024cd2fb20895f5834a2bde7dbdfea583 /src/main/java/net/minecraft/server/EntityLiving.java | |
| parent | e54d8c33529b9495b9ca1a610dc2ff9fc5ac84b5 (diff) | |
| download | craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.gz craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.lz craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.tar.xz craftbukkit-309846d732849b68e382c53bf3a0d7a6dfd82579.zip | |
Whitespace + general cleanup
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityLiving.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityLiving.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index c4e1c2e1..ba97a4c4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -60,7 +60,7 @@ public abstract class EntityLiving extends Entity { protected double aq; protected double ar; float as = 0.0F; - public int lastDamage = 0; // CraftBukkit protected -> public + public int lastDamage = 0; // CraftBukkit - protected -> public protected int au = 0; protected float av; protected float aw; @@ -241,7 +241,7 @@ public abstract class EntityLiving extends Entity { if (f > 0.05F) { f3 = 1.0F; f2 = f * 3.0F; - // CraftBukkit -- Math -> TrigMath + // CraftBukkit - Math -> TrigMath f1 = (float) TrigMath.atan2(d1, d0) * 180.0F / 3.1415927F - 90.0F; } @@ -837,6 +837,7 @@ public abstract class EntityLiving extends Entity { if (event.isCancelled() || event.getDamage() == 0) { return; } + damageDone = event.getDamage(); this.damageEntity((Entity) null, damageDone); // CraftBukkit end |