Fixed blockCreatureSpawn not working.

EngineHub · Sep 26, 2018 · 01dfebe · 01dfebe
1 parent 87e5770
commit 01dfebe
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...d-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java b/...d-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java
@@ -632,7 +632,9 @@ public void onCreatureSpawn(CreatureSpawnEvent event) {
 
         EntityType entityType = event.getEntityType();
 
-        if (wcfg.blockCreatureSpawn.contains(entityType)) {
+        com.sk89q.worldedit.world.entity.EntityType weEntityType = BukkitAdapter.adapt(entityType);
+
+        if (weEntityType != null && wcfg.blockCreatureSpawn.contains(weEntityType)) {
             event.setCancelled(true);
             return;
         }
@@ -649,7 +651,6 @@ public void onCreatureSpawn(CreatureSpawnEvent event) {
             }
 
             Set<com.sk89q.worldedit.world.entity.EntityType> entityTypes = set.queryValue(null, Flags.DENY_SPAWN);
-            com.sk89q.worldedit.world.entity.EntityType weEntityType = BukkitAdapter.adapt(entityType);
             if (entityTypes != null && weEntityType != null && entityTypes.contains(weEntityType)) {
                 event.setCancelled(true);
                 return;