More runtime errors

Author: APickledWalrus

src/main/java/org/skriptlang/skriptworldguard/elements/effects/EffCreateRegion.java

@@ -3,7 +3,6 @@
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Example;
 import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.RequiredPlugins;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
@@ -38,7 +37,7 @@
 		" Then, with the provided heights, the shape is extended vertically to form the region." +
 		" At least three points must be provided to create a polygonal region.",
 	"Note that if you do not specify the world for a region, you must be sure that the locations provided all have the same world.",
-	"Note that Region IDs are only valid if they contain letters, numbers, underscores, commas, single quotation marks, dashes, pluses, or forward slashes.",
+	"Note that Region IDs are only valid if they contain letters, numbers, underscores, commas, single quotation marks, dashes, pluses, and forward slashes.",
 	"Note that if you attempt to create a region in a world where a region with the same ID already exists, that region will be replaced."
 })
 @Example("create a temporary global region named \"temporary_global_region\" in the player's world")
@@ -88,7 +87,12 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	@Override
 	protected void execute(Event event) {
 		String id = this.id.getSingle(event);
-		if (id == null || !ProtectedRegion.isValidId(id)) {
+		if (id == null) {
+			return;
+		}
+		if (!ProtectedRegion.isValidId(id)) {
+			error("'" + id + "' is an invalid region ID. Region IDs can only contain" +
+					" letters, numbers, underscores, commas, single quotation marks, dashes, pluses, and forward slashes");
 			return;
 		}
 
@@ -109,6 +113,8 @@ protected void execute(Event event) {
 				World secondCornerWorld = secondCorner.getWorld();
 				// We want the locations to have matching worlds
 				if (firstCornerWorld == null || firstCornerWorld != secondCornerWorld) {
+					error("A world to create the region in was not specified,"
+							+ " but the provided corner points have different worlds");
 					return;
 				}
 				world = firstCornerWorld;
@@ -121,7 +127,11 @@ protected void execute(Event event) {
 			Number minY = this.minY.getSingle(event);
 			Number maxY = this.maxY.getSingle(event);
 			Location[] points = this.points.getArray(event);
-			if (minY == null || maxY == null || points.length < 3) {
+			if (minY == null || maxY == null || points.length == 0) {
+				return;
+			}
+			if (points.length < 3) {
+				error("A polygonal region needs at least 3 points, but only " + points.length + " points were provided");
 				return;
 			}
 
@@ -130,6 +140,10 @@ protected void execute(Event event) {
 				for (Location point : points) { // We want the locations to have matching worlds
 					World pointWorld = point.getWorld();
 					if (pointWorld == null || pointWorld != world) {
+						if (this.world == null) { // only error if the user didn't specify a world
+							error("A world to create the region in was not specified,"
+									+ " but the provided points have different worlds");
+						}
 						return;
 					}
 				}

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

@@ -10,7 +10,6 @@
 import com.sk89q.worldguard.session.MoveType;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
-import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.bukkit.registration.BukkitRegistryKeys;
@@ -31,7 +30,7 @@ public static void register(SyntaxRegistry registry) {
 				.addPatterns("region enter[ing]",
 						"enter[ing] of " + regionPattern,
 						"region (exit[ing]|leav(e|ing))",
-						"exit[ing] of " + regionPattern)
+						"(exit[ing]|leav(e|ing)) of " + regionPattern)
 				.addDescription("Called when a player enters or leaves a region.")
 				.addExample("""
 						on region enter:
@@ -40,7 +39,6 @@ public static void register(SyntaxRegistry registry) {
 				.addSince("1.0")
 				.build());
 		EventValues.registerEventValue(RegionEnterLeaveEvent.class, WorldGuardRegion.class, RegionEnterLeaveEvent::getRegion);
-		EventValues.registerEventValue(RegionEnterLeaveEvent.class, Player.class, RegionEnterLeaveEvent::getPlayer);
 		EventValues.registerEventValue(RegionEnterLeaveEvent.class, MoveType.class, RegionEnterLeaveEvent::getMoveType);
 	}