From 17e74d9ed2fb1f72976a97a58bd35173b8d10819 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Thu, 2 Sep 2021 22:31:10 +0200 Subject: [PATCH] Cancel locate --- .../java/com/volmit/iris/core/service/CommandSVC.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/com/volmit/iris/core/service/CommandSVC.java b/src/main/java/com/volmit/iris/core/service/CommandSVC.java index 2de28725d..4c1838ba2 100644 --- a/src/main/java/com/volmit/iris/core/service/CommandSVC.java +++ b/src/main/java/com/volmit/iris/core/service/CommandSVC.java @@ -20,11 +20,14 @@ package com.volmit.iris.core.service; import com.volmit.iris.Iris; import com.volmit.iris.core.commands.CommandIris; +import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.decree.DecreeSystem; import com.volmit.iris.util.decree.virtual.VirtualDecreeCommand; +import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.IrisService; +import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerCommandPreprocessEvent; @@ -56,8 +59,14 @@ public class CommandSVC implements IrisService, DecreeSystem { if (future != null) { future.complete(args[2]); e.setCancelled(true); + return; } } + + if ((msg.startsWith("locate ") || msg.startsWith("locatebiome ")) && IrisToolbelt.isIrisWorld(e.getPlayer().getWorld())){ + new VolmitSender(e.getPlayer()).sendMessage(C.RED + "Locating biomes & objects is disabled in Iris Worlds. Use /iris studio goto "); + e.setCancelled(true); + } } @Override