possible fix for spawner spawn event dup

DenizenScript · Dec 27, 2020 · 5c5214c · 5c5214c
1 parent 475af32
commit 5c5214c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntitySpawnScriptEvent.java
@@ -115,7 +115,11 @@ public void onEntitySpawn(EntitySpawnEvent event) {
         this.entity = new EntityTag(entity);
         location = new LocationTag(event.getLocation());
         if (event instanceof CreatureSpawnEvent) {
-            reason = new ElementTag(((CreatureSpawnEvent) event).getSpawnReason().name());
+            CreatureSpawnEvent.SpawnReason creatureReason = ((CreatureSpawnEvent) event).getSpawnReason();
+            if (creatureReason == CreatureSpawnEvent.SpawnReason.SPAWNER) {
+                return; // Let the SpawnerSpawnEvent happen and handle it instead
+            }
+            reason = new ElementTag(creatureReason.name());
         }
         else if (event instanceof SpawnerSpawnEvent) {
             reason = new ElementTag("SPAWNER");