From 3e323f8cc2786236ed4c14bb821aa58cab4738aa Mon Sep 17 00:00:00 2001
From: Tavies <78396492+Tavies@users.noreply.github.com>
Date: Fri, 26 Dec 2025 00:37:02 -0800
Subject: [PATCH] Update GeneralCommands.java

Changed aliases to not conflict with standard minecraft commands (locate) and other plugins.
---
 .../com/sk89q/worldguard/commands/GeneralCommands.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/GeneralCommands.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/GeneralCommands.java
index 61aa037c0..99c0e8d04 100644
--- a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/GeneralCommands.java
+++ b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/GeneralCommands.java
@@ -39,7 +39,7 @@ public GeneralCommands(WorldGuard worldGuard) {
         this.worldGuard = worldGuard;
     }
     
-    @Command(aliases = {"god"}, usage = "[player]",
+    @Command(aliases = {"wggod"}, usage = "[player]",
             desc = "Enable godmode on a player", flags = "s", max = 1)
     public void god(CommandContext args, Actor sender) throws CommandException, AuthorizationException {
         Iterable<? extends LocalPlayer> targets = null;
@@ -84,7 +84,7 @@ public void god(CommandContext args, Actor sender) throws CommandException, Auth
         }
     }
     
-    @Command(aliases = {"ungod"}, usage = "[player]",
+    @Command(aliases = {"wgungod"}, usage = "[player]",
             desc = "Disable godmode on a player", flags = "s", max = 1)
     public void ungod(CommandContext args, Actor sender) throws CommandException, AuthorizationException {
         Iterable<? extends LocalPlayer> targets;
@@ -127,7 +127,7 @@ public void ungod(CommandContext args, Actor sender) throws CommandException, Au
         }
     }
     
-    @Command(aliases = {"heal"}, usage = "[player]", desc = "Heal a player", flags = "s", max = 1)
+    @Command(aliases = {"wgheal"}, usage = "[player]", desc = "Heal a player", flags = "s", max = 1)
     public void heal(CommandContext args, Actor sender) throws CommandException, AuthorizationException {
 
         Iterable<? extends LocalPlayer> targets = null;
@@ -171,7 +171,7 @@ public void heal(CommandContext args, Actor sender) throws CommandException, Aut
         }
     }
     
-    @Command(aliases = {"slay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1)
+    @Command(aliases = {"wgslay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1)
     public void slay(CommandContext args, Actor sender) throws CommandException, AuthorizationException {
         
         Iterable<? extends LocalPlayer> targets = Lists.newArrayList();
@@ -212,7 +212,7 @@ public void slay(CommandContext args, Actor sender) throws CommandException, Aut
         }
     }
     
-    @Command(aliases = {"locate"}, usage = "[player]", desc = "Locate a player", max = 1)
+    @Command(aliases = {"wglocate"}, usage = "[player]", desc = "Locate a player", max = 1)
     @CommandPermissions({"worldguard.locate"})
     public void locate(CommandContext args, Actor sender) throws CommandException {
         LocalPlayer player = worldGuard.checkPlayer(sender);