summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-01-31 21:50:28 +0000
committerDinnerbone <dinnerbone@dinnerbone.com>2011-01-31 21:50:28 +0000
commit82febb3887fa1ca3de2fb364ea01b1847964e4d2 (patch)
treeffe1bfc95af5d9b94a1080aada8b5ba8d2cd6f01 /src/main
parentc2fdd5cadd1f7616f8c792a630869cc9694ba370 (diff)
downloadcraftbukkit-82febb3887fa1ca3de2fb364ea01b1847964e4d2.tar
craftbukkit-82febb3887fa1ca3de2fb364ea01b1847964e4d2.tar.gz
craftbukkit-82febb3887fa1ca3de2fb364ea01b1847964e4d2.tar.lz
craftbukkit-82febb3887fa1ca3de2fb364ea01b1847964e4d2.tar.xz
craftbukkit-82febb3887fa1ca3de2fb364ea01b1847964e4d2.zip
ENTITY_DAMAGED now knows hot from wet
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/minecraft/server/Entity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7b574d2e..cbb65852 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -221,7 +221,7 @@ public abstract class Entity {
if(this instanceof EntityLiving) {
CraftServer server = ((WorldServer) this.world).getServer();
org.bukkit.entity.Entity damagee = this.getBukkitEntity();
- DamageCause damageType = EntityDamageEvent.DamageCause.DROWNING;
+ DamageCause damageType = EntityDamageEvent.DamageCause.FIRE_TICK;
int damageDone = 1;
EntityDamageEvent event = new EntityDamageEvent(damagee, damageType, damageDone);