diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index f56ce0763..3ecc572db 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -118,7 +118,6 @@ import java.util.regex.Pattern;
             case SPECTRAL_ARROW:
             case SPLASH_POTION:
             case THROWN_EXP_BOTTLE:
-            case TRIDENT:
                 // projectile
             case FALLING_BLOCK:
             case PRIMED_TNT:
@@ -181,7 +180,6 @@ import java.util.regex.Pattern;
             case VILLAGER:
             case WOLF:
             case ZOMBIE_HORSE:
-            case WANDERING_TRADER:
                 // animal
                 return EntityUtil
                     .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP);
@@ -2164,16 +2162,8 @@ import java.util.regex.Pattern;
                 }
                 break;
             case REINFORCEMENTS:
-            case VILLAGE_DEFENSE:
-            case VILLAGE_INVASION:
             case NATURAL:
             case CHUNK_GEN:
-            case SILVERFISH_BLOCK:
-            case ENDER_PEARL:
-            case DROWNED:
-            case CURED:
-            case DEFAULT:
-            case LIGHTNING:
                 if (!area.MOB_SPAWNING) {
                     event.setCancelled(true);
                     return;
@@ -2278,7 +2268,16 @@ import java.util.regex.Pattern;
         Entity ignitingEntity = event.getIgnitingEntity();
         Block block = event.getBlock();
         BlockIgniteEvent.IgniteCause igniteCause = event.getCause();
-        Location location1 = BukkitUtil.getLocation(block.getLocation());
+        Location location1;
+        if (block != null) {
+            location1 = BukkitUtil.getLocation(block.getLocation());
+        } else if (ignitingEntity != null) {
+            location1 = BukkitUtil.getLocation(ignitingEntity);
+        } else if (player != null) {
+            location1 = BukkitUtil.getLocation(player);
+        } else {
+            return;
+        }
         PlotArea area = location1.getPlotArea();
         if (area == null) {
             return;