From d2033d49ca00e52c90dce9b13e8e27a01303ce2f Mon Sep 17 00:00:00 2001
From: Zeranny <danielhorn1@hotmail.co.uk>
Date: Sun, 21 Jul 2024 08:48:57 +0100
Subject: [PATCH] Fix parseFromInput Method for Masks and Patterns When Called
 via API (#2839)

Explicitly Mask or Pattern in parseFromInput
---
 .../sk89q/worldedit/extension/factory/MaskFactory.java   | 6 ++++++
 .../worldedit/extension/factory/PatternFactory.java      | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/MaskFactory.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/MaskFactory.java
index 3440b009c..dce3e1c4f 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/MaskFactory.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/MaskFactory.java
@@ -53,6 +53,7 @@ import com.sk89q.worldedit.extension.factory.parser.mask.NoiseMaskParser;
 import com.sk89q.worldedit.extension.factory.parser.mask.OffsetMaskParser;
 import com.sk89q.worldedit.extension.factory.parser.mask.RegionMaskParser;
 import com.sk89q.worldedit.extension.factory.parser.mask.SolidMaskParser;
+import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.NoMatchException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
@@ -132,6 +133,11 @@ public final class MaskFactory extends AbstractFactory<Mask> {
 
     //FAWE start - rich mask parsing
 
+    @Override
+    public Mask parseFromInput(String input, ParserContext context) throws InputParseException {
+        return super.parseFromInput(input, context);
+    }
+
     @Override
     protected Mask getParsed(final String input, final List<Mask> masks) {
         return switch (masks.size()) {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/PatternFactory.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/PatternFactory.java
index 25955adee..242d1d7bc 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/PatternFactory.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/PatternFactory.java
@@ -60,7 +60,9 @@ import com.sk89q.worldedit.extension.factory.parser.pattern.RandomPatternParser;
 import com.sk89q.worldedit.extension.factory.parser.pattern.RandomStatePatternParser;
 import com.sk89q.worldedit.extension.factory.parser.pattern.SingleBlockPatternParser;
 import com.sk89q.worldedit.extension.factory.parser.pattern.TypeOrStateApplyingPatternParser;
+import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.NoMatchException;
+import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.function.pattern.RandomPattern;
 import com.sk89q.worldedit.internal.registry.AbstractFactory;
@@ -130,6 +132,13 @@ public final class PatternFactory extends AbstractFactory<Pattern> {
         register(new VoronoiPatternParser(worldEdit));
     }
 
+    //FAWE start - rich pattern parsing
+
+    @Override
+    public Pattern parseFromInput(String input, ParserContext context) throws InputParseException {
+        return super.parseFromInput(input, context);
+    }
+
     @Override
     protected Pattern getParsed(final String input, final List<Pattern> patterns) {
         switch (patterns.size()) {