From 904fdfd1dcd5d9930b9377ee27e19d94d9f6a5f3 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Thu, 18 Jul 2019 15:43:55 -0400
Subject: [PATCH] Fixed WildStacker conversion.

---
 .gitlab-ci.yml                                |  2 +-
 pom.xml                                       |  2 +-
 .../convert/WildStackerConvert.java           | 24 +++++++++++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f3be73..f23e133 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
 variables:
     name: "UltimateStacker"
     path: "/builds/$CI_PROJECT_PATH"
-    version: "1.6.8"
+    version: "1.6.9"
 
 build:
   stage: build
diff --git a/pom.xml b/pom.xml
index 54752df..aeb36ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>uk.antiperson</groupId>
             <artifactId>stackmob</artifactId>
-            <version>4</version>
+            <version>4-0-2</version>
         </dependency>
         <dependency>
             <groupId>me.minebuilders</groupId>
diff --git a/src/main/java/com/songoda/ultimatestacker/convert/WildStackerConvert.java b/src/main/java/com/songoda/ultimatestacker/convert/WildStackerConvert.java
index 0509016..b9a3d9b 100644
--- a/src/main/java/com/songoda/ultimatestacker/convert/WildStackerConvert.java
+++ b/src/main/java/com/songoda/ultimatestacker/convert/WildStackerConvert.java
@@ -2,12 +2,15 @@ package com.songoda.ultimatestacker.convert;
 
 import com.bgsoftware.wildstacker.WildStackerPlugin;
 import com.bgsoftware.wildstacker.api.WildStackerAPI;
-import com.bgsoftware.wildstacker.api.objects.StackedEntity;
 import com.bgsoftware.wildstacker.api.objects.StackedSpawner;
 import com.songoda.ultimatestacker.UltimateStacker;
 import com.songoda.ultimatestacker.entity.EntityStackManager;
 import com.songoda.ultimatestacker.spawner.SpawnerStack;
 import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.block.CreatureSpawner;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
 
 public class WildStackerConvert implements Convert {
 
@@ -35,12 +38,17 @@ public class WildStackerConvert implements Convert {
     @Override
     public void convertEntities() {
         EntityStackManager entityStackManager = plugin.getEntityStackManager();
-        for (StackedEntity entity : WildStackerAPI.getWildStacker().getSystemManager().getStackedEntities()) {
-            if (!entityStackManager.isStacked(entity.getLivingEntity())) {
-                entityStackManager.addStack(entity.getLivingEntity(), entity.getStackAmount());
-                continue;
+        for (World world : Bukkit.getWorlds()) {
+            for (Entity entity : world.getEntities()) {
+                if (!(entity instanceof LivingEntity)) continue;
+                if (!entityStackManager.isStacked(entity)) {
+                    entityStackManager
+                            .addStack(entity, WildStackerAPI.getEntityAmount((LivingEntity)entity));
+                    continue;
+                }
+                entityStackManager
+                        .getStack(entity).setAmount(WildStackerAPI.getEntityAmount((LivingEntity)entity));
             }
-            entityStackManager.getStack(entity.getLivingEntity()).setAmount(entity.getStackAmount());
         }
 
     }
@@ -49,7 +57,9 @@ public class WildStackerConvert implements Convert {
     public void convertSpawners() {
         for (StackedSpawner spawner : WildStackerAPI.getWildStacker().getSystemManager().getStackedSpawners()) {
             SpawnerStack stack = plugin.getSpawnerStackManager().getSpawner(spawner.getLocation());
-            stack.setAmount(spawner.getStackAmount());
+
+            stack.setAmount(WildStackerAPI
+                    .getSpawnersAmount((CreatureSpawner) spawner.getLocation().getBlock().getState()));
             if (plugin.getHologram() != null)
                 plugin.getHologram().add(stack);
         }