summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-06-09 12:45:01 +1000
committermd_5 <git@md-5.net>2016-06-09 12:45:01 +1000
commita4fe2264e678cdc646098df61398ea8a10b0731a (patch)
tree5a8191e80017f245f60eb40457da7e753a114df2
parent6dc24a62f4662f288cff1397db80eca5a2520bd8 (diff)
downloadbukkit-a4fe2264e678cdc646098df61398ea8a10b0731a.tar
bukkit-a4fe2264e678cdc646098df61398ea8a10b0731a.tar.gz
bukkit-a4fe2264e678cdc646098df61398ea8a10b0731a.tar.lz
bukkit-a4fe2264e678cdc646098df61398ea8a10b0731a.tar.xz
bukkit-a4fe2264e678cdc646098df61398ea8a10b0731a.zip
Add DamageCause.HOT_FLOOR
-rw-r--r--src/main/java/org/bukkit/event/entity/EntityDamageEvent.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
index 3a5a42a0..0201d597 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
@@ -4,6 +4,7 @@ import java.util.EnumMap;
import java.util.Map;
import org.apache.commons.lang.Validate;
+import org.bukkit.Material;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
@@ -424,6 +425,12 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
* <p>
* Damage: variable
*/
- FLY_INTO_WALL
+ FLY_INTO_WALL,
+ /**
+ * Damage caused when an entity steps on {@link Material#MAGMA}.
+ * <p>
+ * Damage: 1
+ */
+ HOT_FLOOR
}
}