From d6aa849bc62f789da49c6feb8e7162209b0c5401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien?=
 <43724816+Aurelien30000@users.noreply.github.com>
Date: Fri, 23 Jun 2023 11:22:49 +0200
Subject: [PATCH] Fix pattern parsing & some pattern outputs (#265)

---
 .../voxelsniper/command/executor/VoxelExecutor.java       | 8 +++++---
 .../voxelsniper/command/executor/VoxelInkExecutor.java    | 2 +-
 .../voxelsniper/sniper/snipe/message/SnipeMessenger.java  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/thevoxelbox/voxelsniper/command/executor/VoxelExecutor.java b/src/main/java/com/thevoxelbox/voxelsniper/command/executor/VoxelExecutor.java
index 385c1387..0d6b78d8 100644
--- a/src/main/java/com/thevoxelbox/voxelsniper/command/executor/VoxelExecutor.java
+++ b/src/main/java/com/thevoxelbox/voxelsniper/command/executor/VoxelExecutor.java
@@ -2,6 +2,7 @@
 
 import com.fastasyncworldedit.core.configuration.Caption;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.pattern.Pattern;
@@ -77,11 +78,12 @@ public void executeCommand(CommandSender sender, String[] arguments) {
                 messenger.sendPatternMessage(toolkitProperties.getPattern());
             }
         } else {
+            BukkitPlayer wePlayer = BukkitAdapter.adapt(player);
             ParserContext parserContext = new ParserContext();
-            parserContext.setActor(BukkitAdapter.adapt(sender));
+            parserContext.setSession(wePlayer.getSession());
+            parserContext.setWorld(wePlayer.getWorld());
+            parserContext.setActor(wePlayer);
             parserContext.setRestricted(false);
-            parserContext.setPreferringWildcard(true);
-            parserContext.setWorld(BukkitAdapter.adapt(((Player) sender).getWorld()));
             try {
                 String argument = arguments[0].toLowerCase(Locale.ROOT);
                 Pattern pattern = plugin.getPatternParser().parseFromInput(argument, parserContext);
diff --git a/src/main/java/com/thevoxelbox/voxelsniper/command/executor/VoxelInkExecutor.java b/src/main/java/com/thevoxelbox/voxelsniper/command/executor/VoxelInkExecutor.java
index 7f3d9688..615b9a9d 100644
--- a/src/main/java/com/thevoxelbox/voxelsniper/command/executor/VoxelInkExecutor.java
+++ b/src/main/java/com/thevoxelbox/voxelsniper/command/executor/VoxelInkExecutor.java
@@ -74,7 +74,7 @@ public void executeCommand(CommandSender sender, String[] arguments) {
 
         toolkitProperties.setPattern(new BrushPattern(blockState));
         Messenger messenger = new Messenger(plugin, sender);
-        messenger.sendPatternMessage(toolkitProperties.getReplacePattern());
+        messenger.sendPatternMessage(toolkitProperties.getPattern());
     }
 
 }
diff --git a/src/main/java/com/thevoxelbox/voxelsniper/sniper/snipe/message/SnipeMessenger.java b/src/main/java/com/thevoxelbox/voxelsniper/sniper/snipe/message/SnipeMessenger.java
index 7b6a992d..2825d3da 100644
--- a/src/main/java/com/thevoxelbox/voxelsniper/sniper/snipe/message/SnipeMessenger.java
+++ b/src/main/java/com/thevoxelbox/voxelsniper/sniper/snipe/message/SnipeMessenger.java
@@ -32,7 +32,7 @@ public void sendPatternMessage() {
     }
 
     public void sendReplacePatternMessage() {
-        this.messenger.sendPatternMessage(this.toolkitProperties.getReplacePattern());
+        this.messenger.sendReplacePatternMessage(this.toolkitProperties.getReplacePattern());
     }
 
     public void sendBrushSizeMessage() {