From 2b449a1f3d0a90792eaf9698ff2d5f3435c12d6c Mon Sep 17 00:00:00 2001
From: Julian Krings <47589149+CrazyDev05@users.noreply.github.com>
Date: Fri, 17 Nov 2023 11:40:56 +0100
Subject: [PATCH] Add Settings check before calling WorldEditLink

---
 .../java/com/volmit/iris/core/service/WandSVC.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/core/service/WandSVC.java b/core/src/main/java/com/volmit/iris/core/service/WandSVC.java
index 7f564c8af..06549248a 100644
--- a/core/src/main/java/com/volmit/iris/core/service/WandSVC.java
+++ b/core/src/main/java/com/volmit/iris/core/service/WandSVC.java
@@ -226,17 +226,19 @@ public class WandSVC implements IrisService {
             return getCuboidFromItem(p.getInventory().getItemInMainHand());
         }
 
-        Cuboid c = WorldEditLink.getSelection(p);
+        if (IrisSettings.get().getWorld().worldEditWandCUI) {
+            Cuboid c = WorldEditLink.getSelection(p);
 
-        if (c != null) {
-            return new Location[]{c.getLowerNE(), c.getUpperSW()};
+            if (c != null) {
+                return new Location[]{c.getLowerNE(), c.getUpperSW()};
+            }
         }
 
         return null;
     }
 
     public static boolean isHoldingWand(Player p) {
-        return isHoldingIrisWand(p) || WorldEditLink.getSelection(p) != null;
+        return isHoldingIrisWand(p) || (IrisSettings.get().getWorld().worldEditWandCUI && WorldEditLink.getSelection(p) != null);
     }
 
     public static boolean isHoldingIrisWand(Player p) {