Merge pull request #37 from TeamHRLive/development

Development
craftaro · Aug 21, 2024 · 37350c1 · 37350c1
2 parents da7ee89 + 7527e2b
commit 37350c1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/EpicSpawners-Plugin/src/main/java/com/craftaro/epicspawners/gui/SpawnerBoostGui.java b/EpicSpawners-Plugin/src/main/java/com/craftaro/epicspawners/gui/SpawnerBoostGui.java
@@ -80,11 +80,6 @@ public void paint() {
                 ),
                 event -> purchaseBoost(this.player, 5, this.amount));
 
-        System.err.println(this.plugin.getLocale().getMessage("interface.boost.cost").toText());
-
-        System.err.println(this.plugin.getLocale().getMessage("interface.boost.cost")
-                .processPlaceholder("cost", getBoostCost(5, this.amount)).toText());
-
         setButton("boost15", 12, GuiUtils.createButtonItem(XMaterial.IRON_INGOT, this.plugin.getLocale().getMessage("interface.boost.boostfor")
                                 .processPlaceholder("amount", "15"),
                         this.plugin.getLocale().getMessage("interface.boost.cost")

diff --git a/...in/src/main/java/com/craftaro/epicspawners/spawners/spawner/option/SpawnOptionEntity.java b/...in/src/main/java/com/craftaro/epicspawners/spawners/spawner/option/SpawnOptionEntity.java
@@ -1,7 +1,7 @@
 package com.craftaro.epicspawners.spawners.spawner.option;
 
 import com.craftaro.core.math.MathUtils;
-import com.craftaro.core.utils.EntityUtils;
+import com.craftaro.core.nms.Nms;
 import com.craftaro.epicspawners.EpicSpawners;
 import com.craftaro.epicspawners.api.boosts.types.Boosted;
 import com.craftaro.epicspawners.api.events.SpawnerSpawnEvent;
@@ -63,7 +63,8 @@ public void spawn(SpawnerTier data, SpawnerStack stack, PlacedSpawner spawner) {
             equation = equation.replace("{RAND}", Integer.toString(randomAmt));
             equation = equation.replace("{STACK_SIZE}", Integer.toString(stack.getStackSize()));
 
-            spawnCount += MathUtils.eval(equation, "EpicSpawners (Mobs Spawned Per Single Spawn) Equation");
+            spawnCount += (int) MathUtils.eval(equation, "EpicSpawners (Mobs Spawned Per Single Spawn) Equation");
+            System.out.println(spawnCount);
         }
 
         // Get the max entities allowed around a spawner.
@@ -108,7 +109,7 @@ public void spawn(SpawnerTier data, SpawnerStack stack, PlacedSpawner spawner) {
                     }
 
                     if (Settings.NO_AI.getBoolean()) {
-                        EntityUtils.setUnaware(entity);
+                        Nms.getImplementations().getEntity().setMobAware(entity,false);
                     }
 
                     this.plugin.getSpawnManager().addUnnaturalSpawn(entity.getUniqueId());

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
     <url>https://craftaro.com/marketplace/product/13</url>
 
     <properties>
-        <craftaro.coreVersion>3.1.0-SNAPSHOT</craftaro.coreVersion>
+        <craftaro.coreVersion>3.3.0-SNAPSHOT</craftaro.coreVersion>
 
         <maven.compiler.release>8</maven.compiler.release>
         <maven.compiler.target>1.8</maven.compiler.target>