From 28430cc1c30376818c2235703bc9fd384487b117 Mon Sep 17 00:00:00 2001
From: CocoTheOwner <sjoerdvdgoor02@gmail.com>
Date: Sun, 7 Feb 2021 12:52:07 +0100
Subject: [PATCH] Fix /locate command override

---
 src/main/java/com/volmit/iris/Iris.java        |  3 +++
 .../iris/manager/command/CommandLocate.java    | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java
index 68a16c804..ebce4af98 100644
--- a/src/main/java/com/volmit/iris/Iris.java
+++ b/src/main/java/com/volmit/iris/Iris.java
@@ -2,6 +2,7 @@ package com.volmit.iris;
 
 import com.volmit.iris.manager.*;
 import com.volmit.iris.manager.command.CommandIris;
+import com.volmit.iris.manager.command.CommandLocate;
 import com.volmit.iris.manager.command.PermissionIris;
 import com.volmit.iris.manager.link.BKLink;
 import com.volmit.iris.manager.link.CitizensLink;
@@ -20,6 +21,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.event.HandlerList;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.event.Listener;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -169,6 +171,7 @@ public class Iris extends VolmitPlugin
 		J.sr(this::tickQueue, 0);
 		J.ar(this::checkConfigHotload, 50);
 		PaperLib.suggestPaper(this);
+		getServer().getPluginManager().registerEvents(new CommandLocate(), this);
 		super.onEnable();
 	}
 
diff --git a/src/main/java/com/volmit/iris/manager/command/CommandLocate.java b/src/main/java/com/volmit/iris/manager/command/CommandLocate.java
index 3a9a8539c..72f101884 100644
--- a/src/main/java/com/volmit/iris/manager/command/CommandLocate.java
+++ b/src/main/java/com/volmit/iris/manager/command/CommandLocate.java
@@ -2,18 +2,26 @@ package com.volmit.iris.manager.command;
 
 import com.volmit.iris.Iris;
 import com.volmit.iris.scaffold.IrisWorlds;
-import com.volmit.iris.util.Command;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.MortarCommand;
 import com.volmit.iris.util.MortarSender;
+import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
-import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
-public class CommandLocate extends MortarCommand
+public class CommandLocate extends MortarCommand implements Listener
 {
-    @Command
-    private CommandIrisStudioGoto got0;
+    @EventHandler
+    public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) {
+        if (event.getMessage().contains("locate") && IrisWorlds.isIrisWorld(event.getPlayer().getWorld())){
+            MortarSender s = (MortarSender) event.getPlayer();
+            s.sendMessage("/locate command blocked in Iris worlds. Please use '/ir goto' instead.");
+            event.setCancelled(true);
+        }
+    }
 
     public CommandLocate()
     {