Potential fix for NPE when using EpicSpawners 7 (#1188)

BG-Software-LLC · Jul 2, 2022 · 47bfc91 · 47bfc91
1 parent 1671a52
commit 47bfc91
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...ava/com/bgsoftware/superiorskyblock/external/spawners/SpawnersProvider_EpicSpawners7.java b/...ava/com/bgsoftware/superiorskyblock/external/spawners/SpawnersProvider_EpicSpawners7.java
@@ -15,8 +15,8 @@
 import com.songoda.epicspawners.api.events.SpawnerBreakEvent;
 import com.songoda.epicspawners.api.events.SpawnerChangeEvent;
 import com.songoda.epicspawners.api.events.SpawnerPlaceEvent;
-import com.songoda.epicspawners.spawners.spawner.PlacedSpawner;
 import com.songoda.epicspawners.spawners.spawner.SpawnerData;
+import com.songoda.epicspawners.spawners.spawner.SpawnerStack;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
@@ -49,9 +49,11 @@ public Pair<Integer, String> getSpawner(Location location) {
         String entityType = null;
 
         if (Bukkit.isPrimaryThread()) {
-            PlacedSpawner placedSpawner = instance.getSpawnerManager().getSpawnerFromWorld(location);
-            blockCount = placedSpawner.getFirstStack().getStackSize();
-            entityType = placedSpawner.getIdentifyingName();
+            SpawnerStack spawnerStack = instance.getSpawnerManager().getSpawnerFromWorld(location).getFirstStack();
+            if (spawnerStack != null) {
+                blockCount = spawnerStack.getStackSize();
+                entityType = spawnerStack.getCurrentTier().getIdentifyingName();
+            }
         }
 
         return new Pair<>(blockCount, entityType);