Make world optional in "enter/leave" event

Author: APickledWalrus

src/main/java/org/skriptlang/skriptworldguard/elements/events/EvtRegionEnterLeave.java

@@ -1,6 +1,5 @@
 package org.skriptlang.skriptworldguard.elements.events;
 
-import ch.njol.skript.config.Node;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptEvent;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
@@ -14,16 +13,14 @@
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.bukkit.registration.BukkitRegistryKeys;
 import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos;
-import org.skriptlang.skript.log.runtime.SyntaxRuntimeErrorProducer;
 import org.skriptlang.skript.registration.SyntaxRegistry;
 import org.skriptlang.skriptworldguard.worldguard.RegionEnterLeaveEvent;
-import org.skriptlang.skriptworldguard.worldguard.RegionUtils;
 import org.skriptlang.skriptworldguard.worldguard.WorldGuardRegion;
 
-public class EvtRegionEnterLeave extends SkriptEvent implements SyntaxRuntimeErrorProducer {
+public class EvtRegionEnterLeave extends SkriptEvent {
 
 	public static void register(SyntaxRegistry registry) {
-		String regionPattern = "[the] [worldguard] region[s] [with [the] (name[s]|id[s])|named] %*strings% (in|of) [[the] world] %*string%";
+		String regionPattern = "[the] [worldguard] region[s] [with [the] (name[s]|id[s])|named] %*strings% [(in|of) [[the] world] %-*string%]";
 		registry.register(BukkitRegistryKeys.EVENT, BukkitSyntaxInfos.Event.builder(EvtRegionEnterLeave.class, "Region Enter/Leave")
 				.supplier(EvtRegionEnterLeave::new)
 				.addEvent(RegionEnterLeaveEvent.class)
@@ -39,18 +36,16 @@ public static void register(SyntaxRegistry registry) {
 				.addSince("1.0")
 				.build());
 		EventValues.registerEventValue(RegionEnterLeaveEvent.class, WorldGuardRegion.class, RegionEnterLeaveEvent::getRegion);
+		EventValues.registerEventValue(RegionEnterLeaveEvent.class, World.class, event -> event.getRegion().world());
 		EventValues.registerEventValue(RegionEnterLeaveEvent.class, MoveType.class, RegionEnterLeaveEvent::getMoveType);
 	}
 
-	private Node node;
-
 	private @Nullable Literal<String> regionIds;
 	private @Nullable Literal<String> world;
 	private boolean isEntering;
 
 	@Override
 	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
-		node = getParser().getNode();
 		if (args.length != 0) {
 			//noinspection unchecked
 			regionIds = (Literal<String>) args[0];
@@ -69,27 +64,22 @@ public boolean check(Event event) {
 		if (regionIds == null) {
 			return true;
 		}
-		assert world != null;
 
-		// validate world
-		World world = Bukkit.getWorld(this.world.getSingle());
+		World expectedWorld;
 		if (world == null) {
-			error("The world '" + this.world.getSingle() + "' does not exist");
-			return false;
-		}
-
-		// map regions
-		String[] regionIds = this.regionIds.getAll();
-		WorldGuardRegion[] regions = new WorldGuardRegion[regionIds.length];
-		for (int i = 0; i < regionIds.length; i++) {
-			regions[i] = RegionUtils.getRegion(world, regionIds[i]);
-			if (regions[i] == null) {
-				error("The region '" + regionIds[i] + "' does not exist in the world '" + world.getName() + "'");
+			expectedWorld = null;
+		} else {
+			expectedWorld = Bukkit.getWorld(world.getSingle());
+			if (world == null) {
 				return false;
 			}
 		}
 
-		return SimpleExpression.check(regions, region -> region.equals(enterLeaveEvent.getRegion()), false, false);
+		String foundId = enterLeaveEvent.getRegion().name();
+		World foundWorld = enterLeaveEvent.getRegion().world();
+		return SimpleExpression.check(this.regionIds.getAll(),
+				expectedId -> expectedId.equalsIgnoreCase(foundId) && (expectedWorld == null || expectedWorld.equals(foundWorld)),
+				false, false);
 	}
 
 	@Override
@@ -104,21 +94,18 @@ public String toString(@Nullable Event event, boolean debug) {
 			builder.append("exit");
 		}
 		if (regionIds != null) {
-			assert world != null;
 			builder.append("of");
 			if (regionIds.isSingle()) {
 				builder.append("region");
 			} else {
 				builder.append("regions");
 			}
-			builder.append("named", regionIds, "in the world", world);
+			builder.append("named", regionIds);
+			if (world != null) {
+				builder.append("in the world", world);
+			}
 		}
 		return builder.toString();
 	}
 
-	@Override
-	public Node getNode() {
-		return node;
-	}
-
 }