alphanumeric names only

Author: md5sha256

realty-paper-api/src/main/java/io/github/md5sha256/realty/api/SignTextApplicator.java

@@ -111,7 +111,7 @@ public ApplyResult applySignTextIfLoaded(@NotNull World world,
         if (!world.isChunkLoaded(chunkX, chunkZ)) {
             return ApplyResult.BLOCK_NOT_LOADED;
         }
-        Block block = world.getBlockAt(blockX, blockY, blockZ);
+        Block block = world.getBlockAt(blockX, blockY, blockZ);git
         if (!(block.getState(false) instanceof Sign sign)) {
             return ApplyResult.FAILED;
         }

realty-paper/src/main/java/io/github/md5sha256/realty/command/CreateCommand.java

@@ -40,6 +40,7 @@
 import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Pattern;
 
 /**
  * Handles {@code /realty create leasehold <name> <price> <period> <maxextensions>}
@@ -54,6 +55,7 @@ public record CreateCommand(@NotNull RealtyPaperApi api,
                              @NotNull MessageContainer messages) implements CustomCommandBean {
 
     private static final CloudKey<String> NAME = CloudKey.of("name", String.class);
+    private static final Pattern VALID_NAME_PATTERN = Pattern.compile("^[A-Za-z0-9]+$");
     private static final CloudKey<Double> PRICE = CloudKey.of("price", Double.class);
     private static final CloudKey<Duration> PERIOD = CloudKey.of("period", Duration.class);
     private static final CloudKey<Integer> MAX_EXTENSIONS = CloudKey.of("maxextensions", Integer.class);
@@ -110,6 +112,11 @@ private void executeLeasehold(@NotNull CommandContext<Source> ctx) {
             return;
         }
         String name = ctx.get(NAME);
+        if (!VALID_NAME_PATTERN.matcher(name).matches()) {
+            player.sendMessage(messages.messageFor(MessageKeys.CREATE_INVALID_NAME,
+                    Placeholder.unparsed("region", name)));
+            return;
+        }
         double price = ctx.get(PRICE);
         Duration period = ctx.get(PERIOD);
         int maxExtensions = ctx.get(MAX_EXTENSIONS);
@@ -168,6 +175,11 @@ private void executeFreehold(@NotNull CommandContext<Source> ctx) {
             return;
         }
         String name = ctx.get(NAME);
+        if (!VALID_NAME_PATTERN.matcher(name).matches()) {
+            player.sendMessage(messages.messageFor(MessageKeys.CREATE_INVALID_NAME,
+                    Placeholder.unparsed("region", name)));
+            return;
+        }
         Double price = ctx.flags().getValue(PRICE_FLAG, null);
         UUID authority = ctx.flags()
                 .getValue(AUTHORITY_FLAG, settings.get().defaultFreeholdAuthority());

realty-paper/src/main/java/io/github/md5sha256/realty/command/SubregionCommandGroup.java

@@ -38,6 +38,7 @@
 import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Pattern;
 
 public record SubregionCommandGroup(
         @NotNull RealtyPaperApi api,
@@ -50,6 +51,7 @@ public record SubregionCommandGroup(
     private static final CloudKey<String> NAME = CloudKey.of("name", String.class);
     private static final CloudKey<Double> PRICE = CloudKey.of("price", Double.class);
     private static final CloudKey<Duration> DURATION = CloudKey.of("duration", Duration.class);
+    private static final Pattern VALID_NAME_PATTERN = Pattern.compile("^[A-Za-z0-9]+$");
 
     @Override
     public @NotNull List<Command<? extends Source>> commands(
@@ -87,6 +89,11 @@ private void executeQuickCreate(@NotNull CommandContext<Source> ctx) {
         }
         WorldGuardRegion parentRegion = ctx.get(PARENT_REGION);
         String name = ctx.get(NAME);
+        if (!VALID_NAME_PATTERN.matcher(name).matches()) {
+            player.sendMessage(messages.messageFor(MessageKeys.SUBREGION_INVALID_NAME,
+                    Placeholder.unparsed("region", name)));
+            return;
+        }
         double price = ctx.get(PRICE);
         Duration duration = ctx.get(DURATION);
         boolean canBypass = player.hasPermission(BYPASS_PERMISSION);

realty-paper/src/main/java/io/github/md5sha256/realty/localisation/MessageKeys.java

@@ -107,6 +107,7 @@ private MessageKeys() {}
     public static final String CREATE_FREEHOLD_SUCCESS = "create.freehold-success";
     public static final String CREATE_ALREADY_REGISTERED = "create.already-registered";
     public static final String CREATE_REGION_EXISTS = "create.region-exists";
+    public static final String CREATE_INVALID_NAME = "create.invalid-name";
     public static final String CREATE_INCOMPLETE_SELECTION = "create.incomplete-selection";
     public static final String CREATE_ERROR = "create.error";
 
@@ -369,6 +370,7 @@ private MessageKeys() {}
     public static final String SUBREGION_CREATE_SUCCESS = "subregion.create-success";
     public static final String SUBREGION_CREATE_ERROR = "subregion.create-error";
     public static final String SUBREGION_REGION_EXISTS = "subregion.region-exists";
+    public static final String SUBREGION_INVALID_NAME = "subregion.invalid-name";
     public static final String SUBREGION_NO_FREEHOLD = "subregion.no-freehold";
     public static final String SUBREGION_NOT_TITLEHOLDER = "subregion.not-titleholder";
     public static final String SUBREGION_WRONG_WORLD = "subregion.wrong-world";

realty-paper/src/main/resources/messages.yml

@@ -90,6 +90,7 @@ create:
   freehold-success: "Created WorldGuard region <region> and registered it as freehold!"
   already-registered: "Region <region> is already registered in Realty!"
   region-exists: "A WorldGuard region named <region> already exists!"
+  invalid-name: "Region name <region> is invalid. Names must be alphanumeric only."
   incomplete-selection: "You must make a WorldEdit selection first!"
   error: "Failed to create region: <error>"
 
@@ -459,6 +460,7 @@ subregion:
   create-success: "Subregion <region> created as a child of <parent>."
   create-error: "Failed to create subregion: <error>"
   region-exists: "A region named <region> already exists."
+  invalid-name: "Region name <region> is invalid. Names must be alphanumeric only."
   no-freehold: "Region <region> is not a freehold region."
   not-titleholder: "You are not the titleholder of region <region>."
   wrong-world: "Your WorldEdit selection is in a different world than the parent region."