From a607a6a137565e401d65439e7e71109b7a0ae422 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 19 Oct 2020 06:10:37 -0400 Subject: [PATCH] Fix structure manager with paper & worldedit --- src/main/java/com/volmit/iris/IrisSettings.java | 4 ++++ src/main/java/com/volmit/iris/manager/EditManager.java | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/IrisSettings.java b/src/main/java/com/volmit/iris/IrisSettings.java index 4a6b61371..c1e53f707 100644 --- a/src/main/java/com/volmit/iris/IrisSettings.java +++ b/src/main/java/com/volmit/iris/IrisSettings.java @@ -42,6 +42,10 @@ public class IrisSettings @Desc("Useful information when creating iris worlds. Shows object loads & more.") public boolean verbose = false; + @DontObfuscate + @Desc("If true, will not use world edit even if its on the server") + public boolean ignoreWorldEdit = false; + @DontObfuscate @Desc("System Effects") public boolean systemEffects = true; diff --git a/src/main/java/com/volmit/iris/manager/EditManager.java b/src/main/java/com/volmit/iris/manager/EditManager.java index 938247234..45418b149 100644 --- a/src/main/java/com/volmit/iris/manager/EditManager.java +++ b/src/main/java/com/volmit/iris/manager/EditManager.java @@ -8,6 +8,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.world.WorldUnloadEvent; import com.volmit.iris.Iris; +import com.volmit.iris.IrisSettings; import com.volmit.iris.edit.BlockEditor; import com.volmit.iris.edit.BukkitBlockEditor; import com.volmit.iris.edit.WEBlockEditor; @@ -15,6 +16,8 @@ import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KMap; import com.volmit.iris.util.M; +import io.papermc.lib.PaperLib; + public class EditManager implements Listener { private KMap editors; @@ -85,7 +88,7 @@ public class EditManager implements Listener BlockEditor e = null; - if(Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) + if(Bukkit.getPluginManager().isPluginEnabled("WorldEdit") && !PaperLib.isPaper() && !IrisSettings.get().isIgnoreWorldEdit()) { try {