summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorriking <rikingcoding@gmail.com>2013-03-23 19:40:52 -0700
committerriking <rikingcoding@gmail.com>2013-03-23 19:43:05 -0700
commit45147986bfec0ee421fb4cfa61e7c3c68d1ad7b3 (patch)
tree623e6f83ac1c8170c36cc9a899f2a28fae22e1f5 /src/main/java/org
parent97c2758abf36cba8dc7d8f983b82da0d0d1e83ce (diff)
downloadbukkit-45147986bfec0ee421fb4cfa61e7c3c68d1ad7b3.tar
bukkit-45147986bfec0ee421fb4cfa61e7c3c68d1ad7b3.tar.gz
bukkit-45147986bfec0ee421fb4cfa61e7c3c68d1ad7b3.tar.lz
bukkit-45147986bfec0ee421fb4cfa61e7c3c68d1ad7b3.tar.xz
bukkit-45147986bfec0ee421fb4cfa61e7c3c68d1ad7b3.zip
Add Thorns to DamageCause - Related to BUKKIT-3505
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/event/entity/EntityDamageEvent.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
index dcd4e1ad..2ca19c30 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
@@ -189,6 +189,12 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
*/
FALLING_BLOCK,
/**
+ * Damage caused in retaliation to another attack by the Thorns enchantment.
+ * <p />
+ * Damage: 1-4 (Thorns)
+ */
+ THORNS,
+ /**
* Custom damage.
* <p />
* Damage: variable