finishing touches

Author: Burbulinis

src/main/java/org/skriptlang/skript/bukkit/spawners/elements/effects/EffSpawnerItem.java

@@ -7,6 +7,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
+import org.bukkit.block.CreatureSpawner;
 import org.bukkit.event.Event;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.spawner.Spawner;
@@ -66,7 +67,9 @@ protected void execute(Event event) {
 
 			Spawner mobSpawner = SpawnerUtils.getMobSpawner(object);
 			mobSpawner.setSpawnedItem(item);
-			SpawnerUtils.update(mobSpawner);
+
+			if (mobSpawner instanceof CreatureSpawner creatureSpawner)
+				creatureSpawner.update(true, false);
 		}
 	}
 

src/main/java/org/skriptlang/skript/bukkit/spawners/elements/expressions/spawner/ExprSpawnDelay.java

@@ -7,6 +7,7 @@
 import ch.njol.skript.util.Timespan.TimePeriod;
 import ch.njol.util.Math2;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.block.CreatureSpawner;
 import org.bukkit.block.TrialSpawner;
 import org.bukkit.event.Event;
 import org.bukkit.spawner.Spawner;
@@ -76,7 +77,9 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 			if (SpawnerUtils.isMobSpawner(object)) {
 				Spawner mobSpawner = SpawnerUtils.getMobSpawner(object);
 				mobSpawner.setDelay(getNewDelay(mode, mobSpawner.getDelay(), ticks));
-				SpawnerUtils.update(mobSpawner);
+
+				if (mobSpawner instanceof CreatureSpawner creatureSpawner)
+					creatureSpawner.update(true, false);
 			} else if (SpawnerUtils.isTrialSpawner(object)) {
 				TrialSpawner trialSpawner = SpawnerUtils.getTrialSpawner(object);
 				long gameTime = trialSpawner.getWorld().getGameTime();

src/main/java/org/skriptlang/skript/bukkit/spawners/elements/expressions/spawner/ExprSpawnerEntity.java

@@ -12,6 +12,7 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.block.CreatureSpawner;
 import org.bukkit.entity.EntitySnapshot;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.Event;
@@ -97,7 +98,8 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 				spawner.setSpawnedType((EntityType) value);
 			}
 
-			SpawnerUtils.update(spawner);
+			if (spawner instanceof CreatureSpawner creatureSpawner)
+				creatureSpawner.update(true, false);
 		}
 	}
 

src/main/java/org/skriptlang/skript/bukkit/spawners/util/SpawnerUtils.java

@@ -4,7 +4,6 @@
 import ch.njol.skript.util.Timespan;
 import ch.njol.skript.util.Timespan.TimePeriod;
 import org.bukkit.block.Block;
-import org.bukkit.block.CreatureSpawner;
 import org.bukkit.block.TrialSpawner;
 import org.bukkit.spawner.BaseSpawner;
 import org.bukkit.spawner.Spawner;
@@ -109,18 +108,6 @@ public static TrialSpawner getTrialSpawner(Object object) {
 		return (TrialSpawner) object;
 	}
 
-	/**
-	 * Updates the state of the given spawner.
-	 * @param spawner the spawner to update
-	 */
-	public static void update(BaseSpawner spawner) {
-		if (spawner instanceof CreatureSpawner creatureSpawner) {
-			creatureSpawner.update(true, false);
-		} else if (spawner instanceof TrialSpawner trialSpawner) {
-			trialSpawner.update(true, false);
-		}
-	}
-
 	/**
 	 * Returns the trial spawner configuration for the given trial spawner.
 	 *