summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorAndrew Ardill <andrew.ardill@gmail.com>2011-02-12 22:38:37 +1100
committerAndrew Ardill <andrew.ardill@gmail.com>2011-02-12 22:40:28 +1100
commitbe9a264249ce40785c5f5b6463a1095ab6495be6 (patch)
tree816cf3e0fea37ab2a34a2a1cad6b39448f67497d /src/main/java
parente2899b9dd7e211e0e2da7d997e982d9fa5b1754f (diff)
downloadcraftbukkit-be9a264249ce40785c5f5b6463a1095ab6495be6.tar
craftbukkit-be9a264249ce40785c5f5b6463a1095ab6495be6.tar.gz
craftbukkit-be9a264249ce40785c5f5b6463a1095ab6495be6.tar.lz
craftbukkit-be9a264249ce40785c5f5b6463a1095ab6495be6.tar.xz
craftbukkit-be9a264249ce40785c5f5b6463a1095ab6495be6.zip
Fixed bug in event when taking fall damage. Now uses event damage.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/net/minecraft/server/EntityLiving.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 2ac229f1..366f8f1e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -480,7 +480,7 @@ public abstract class EntityLiving extends Entity {
server.getPluginManager().callEvent(event);
if (!event.isCancelled()){
- this.a((Entity) null, i);
+ this.a((Entity) null, event.getDamage());
}
// CraftBukkit end