mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 02:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix structure manager with paper & worldedit

Browse Source
This commit is contained in:
Daniel Mills 2020-10-19 06:10:37 -04:00
parent 2348d4a855
commit a607a6a137
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/volmit/iris/IrisSettings.java
View File

@ -42,6 +42,10 @@ public class IrisSettings
@Desc("Useful information when creating iris worlds. Shows object loads & more.") @Desc("Useful information when creating iris worlds. Shows object loads & more.")
public boolean verbose = false; public boolean verbose = false;
@DontObfuscate
@Desc("If true, will not use world edit even if its on the server")
public boolean ignoreWorldEdit = false;
@DontObfuscate @DontObfuscate
@Desc("System Effects") @Desc("System Effects")
public boolean systemEffects = true; public boolean systemEffects = true;

5
src/main/java/com/volmit/iris/manager/EditManager.java
View File

@ -8,6 +8,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.world.WorldUnloadEvent; import org.bukkit.event.world.WorldUnloadEvent;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings;
import com.volmit.iris.edit.BlockEditor; import com.volmit.iris.edit.BlockEditor;
import com.volmit.iris.edit.BukkitBlockEditor; import com.volmit.iris.edit.BukkitBlockEditor;
import com.volmit.iris.edit.WEBlockEditor; 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.KMap;
import com.volmit.iris.util.M; import com.volmit.iris.util.M;
import io.papermc.lib.PaperLib;
public class EditManager implements Listener public class EditManager implements Listener
{ {
private KMap<World, BlockEditor> editors; private KMap<World, BlockEditor> editors;
@ -85,7 +88,7 @@ public class EditManager implements Listener
BlockEditor e = null; BlockEditor e = null;
if(Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) if(Bukkit.getPluginManager().isPluginEnabled("WorldEdit") && !PaperLib.isPaper() && !IrisSettings.get().isIgnoreWorldEdit())
{ {
try try
{ {