summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-12-23 22:39:33 +1100
committermd_5 <git@md-5.net>2016-12-23 22:40:38 +1100
commit96f03d906578da759c1cf1d4caff7e7cd49cf18c (patch)
tree8f89a65ff911deea660c8e575bc5bf967d2ee1df /src/main/java
parent746cf0f0d7ef9f494699ebecf7404e74b4d57e7a (diff)
downloadcraftbukkit-96f03d906578da759c1cf1d4caff7e7cd49cf18c.tar
craftbukkit-96f03d906578da759c1cf1d4caff7e7cd49cf18c.tar.gz
craftbukkit-96f03d906578da759c1cf1d4caff7e7cd49cf18c.tar.lz
craftbukkit-96f03d906578da759c1cf1d4caff7e7cd49cf18c.tar.xz
craftbukkit-96f03d906578da759c1cf1d4caff7e7cd49cf18c.zip
SPIGOT-2127: Add DamageCause.ENTITY_SWEEP_ATTACK
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 74faf995..a6c15283 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -464,7 +464,7 @@ public class CraftEventFactory {
return event;
} else if (source instanceof EntityDamageSource) {
Entity damager = source.getEntity();
- DamageCause cause = DamageCause.ENTITY_ATTACK;
+ DamageCause cause = (source.isSweep()) ? DamageCause.ENTITY_SWEEP_ATTACK : DamageCause.ENTITY_ATTACK;
if (source instanceof EntityDamageSourceIndirect) {
damager = ((EntityDamageSourceIndirect) source).getProximateDamageSource();