Add 'explosion' as a cause filter possibility, fixes #605

twizmwazin · Jul 11, 2015 · 26c20e1 · 26c20e1
1 parent b7482de
commit 26c20e1
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/main/java/in/twizmwaz/cardinal/module/modules/filter/type/CauseFilter.java b/src/main/java/in/twizmwaz/cardinal/module/modules/filter/type/CauseFilter.java
@@ -3,13 +3,10 @@
 import in.twizmwaz.cardinal.module.modules.filter.FilterModule;
 import in.twizmwaz.cardinal.module.modules.filter.FilterState;
 import in.twizmwaz.cardinal.module.modules.filter.parsers.CauseFilterParser;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
 
-import static in.twizmwaz.cardinal.module.modules.filter.FilterState.ABSTAIN;
-import static in.twizmwaz.cardinal.module.modules.filter.FilterState.ALLOW;
-import static in.twizmwaz.cardinal.module.modules.filter.FilterState.DENY;
+import static in.twizmwaz.cardinal.module.modules.filter.FilterState.*;
 
 public class CauseFilter extends FilterModule {
 
@@ -26,10 +23,8 @@ public FilterState evaluate(final Object... objects) {
             EventCause eventCause = null;
             if (object instanceof Player) {
                 eventCause = EventCause.PLAYER;
-            } else if (object instanceof Entity) {
-                if (((Entity) object).getType().equals(EntityType.PRIMED_TNT)) {
-                    eventCause = EventCause.TNT;
-                }
+            } else if (object instanceof TNTPrimed) {
+                return cause.equals(EventCause.TNT) ? ALLOW : DENY;
             }
             if (cause.equals(eventCause))
                 return ALLOW;
@@ -55,6 +50,7 @@ public static EventCause getEventCause(String string) {
                 case "player":
                     return PLAYER;
                 case "tnt":
+                case "explosion":
                     return TNT;
                 default:
                     return null;