Fix a couple bugs

Author: Burbulinis

src/main/java/org/skriptlang/skript/bukkit/spawners/elements/events/EvtSpawnerSpawn.java

@@ -8,8 +8,6 @@
 import ch.njol.skript.lang.SyntaxStringBuilder;
 import ch.njol.util.coll.CollectionUtils;
 import com.destroystokyo.paper.event.entity.PreSpawnerSpawnEvent;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.Event;
 import org.bukkit.event.entity.EntityEvent;
@@ -26,12 +24,12 @@
 public class EvtSpawnerSpawn extends SkriptEvent {
 
 	public static void register(SyntaxRegistry registry) {
-		Class<? extends Event>[] events = CollectionUtils.array(SpawnerSpawnEvent.class, PreSpawnerSpawnEvent.class);
-		String pattern = "[:pre] spawner spawn[ing] [of %-entitydatas%]";
+		Class<? extends Event>[] events = CollectionUtils.array(SpawnerSpawnEvent.class);
+		String pattern = "mob:mob spawner spawn[ing] [of %-entitydatas%]";
 
 		if (SpawnerUtils.IS_RUNNING_1_21) {
-			events = CollectionUtils.array(SpawnerSpawnEvent.class, PreSpawnerSpawnEvent.class, TrialSpawnerSpawnEvent.class);
-			pattern = "[:pre] [:trial] spawner spawn[ing] [of %-entitydatas%]";
+			events = CollectionUtils.array(SpawnerSpawnEvent.class, TrialSpawnerSpawnEvent.class);
+			pattern = "[:trial|:mob] spawner spawn[ing] [of %-entitydatas%]";
 		}
 
 		registry.register(BukkitRegistryKeys.EVENT, BukkitSyntaxInfos.Event.builder(EvtSpawnerSpawn.class, "Spawner Spawn")
@@ -47,14 +45,15 @@ public static void register(SyntaxRegistry registry) {
 		);
 	}
 
-	private boolean pre;
 	private boolean trial;
+	private boolean mob;
 	private Literal<EntityData<?>> entityDatas;
 
 	@Override
 	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
-		pre = parseResult.hasTag("pre");
 		trial = parseResult.hasTag("trial");
+		mob	= parseResult.hasTag("mob");
+		System.out.println(mob);
 		//noinspection unchecked
 		entityDatas = (Literal<EntityData<?>>) args[0];
 		return true;
@@ -63,12 +62,6 @@ public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResu
 
 	@Override
 	public boolean check(Event event) {
-		if (pre && event instanceof PreSpawnerSpawnEvent preEvent) {
-			Block block = preEvent.getSpawnerLocation().getBlock();
-			if (trial && block.getType() != Material.TRIAL_SPAWNER)
-				return false;
-		}
-
 		if (entityDatas != null) {
 			EntityType currentType = null;
 
@@ -90,23 +83,25 @@ public boolean check(Event event) {
 				return false;
 		}
 
-		if (pre) {
-			return event instanceof PreSpawnerSpawnEvent;
-		} else if (trial) {
+		if (trial) {
 			return event instanceof TrialSpawnerSpawnEvent;
-		} else {
+		} else if (mob) {
 			return event instanceof SpawnerSpawnEvent;
 		}
+
+		return true;
 	}
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
 
-		if (pre)
-			builder.append("pre");
-		if (trial)
+		if (trial) {
 			builder.append("trial");
+		} else if (mob) {
+			builder.append("mob");
+		}
+
 		builder.append("spawner spawn");
 		if (entityDatas != null)
 			builder.append("of", entityDatas);

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

@@ -69,10 +69,11 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 
 			if (!dataType.isTrial() && data instanceof SkriptMobSpawnerData mobData) {
 				SpawnerUtils.applyToMobSpawner(object, mobData);
-			} else if (dataType == SpawnerDataType.TRIAL
+			} else if (
+				dataType == SpawnerDataType.TRIAL
 				&& SpawnerUtils.isTrialSpawner(object)
-				&& data instanceof SkriptTrialSpawnerData trialData)
-			{
+				&& data instanceof SkriptTrialSpawnerData trialData
+			) {
 				trialData.applyDataToTrialSpawner(SpawnerUtils.getTrialSpawner(object), ominous);
 			}
 		}

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

@@ -173,11 +173,11 @@ public static void applyToMobSpawner(Object object, SkriptMobSpawnerData data) {
 	 * @return the SkriptSpawnerData if the object is a valid spawner for the given data type, null otherwise
 	 */
 	public static SkriptSpawnerData getDataFromObject(Object object, SpawnerDataType dataType) {
-		if (dataType.isMob() && isCreatureSpawner(object)) {
+		if ((dataType.isMob() || dataType.isAny()) && isCreatureSpawner(object)) {
 			return SkriptMobSpawnerData.fromSpawner(getCreatureSpawner(object));
-		} else if (dataType.isMob() && isSpawnerMinecart(object)) {
+		} else if ((dataType.isMob() || dataType.isAny()) && isSpawnerMinecart(object)) {
 			return SkriptMobSpawnerData.fromSpawner(getSpawnerMinecart(object));
-		} else if (dataType.isTrial() && isTrialSpawner(object)) {
+		} else if ((dataType.isTrial() || dataType.isAny()) && isTrialSpawner(object)) {
 			return SkriptTrialSpawnerData.fromTrialSpawner(getTrialSpawner(object));
 		}
 		return null;