Merge branch 'master' into afk

retromcorg · Dec 28, 2024 · ddefeb9 · ddefeb9
2 parents f548e85 + 4833aa5
commit ddefeb9
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 905 deletions.
diff --git a/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/Fundamentals.java b/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/Fundamentals.java
@@ -156,20 +156,11 @@ public void onEnable() {
 //        Bukkit.getPluginCommand("pay").setExecutor(new CommandPay());
 //        Bukkit.getPluginCommand("god").setExecutor(new CommandGod());
 //        Bukkit.getPluginCommand("nickname").setExecutor(new CommandNickname());
-        Bukkit.getPluginCommand("realname").setExecutor(new CommandRealname(plugin));
-        Bukkit.getPluginCommand("seen").setExecutor(new CommandSeen(plugin));
 //        Bukkit.getPluginCommand("invsee").setExecutor(new CommandInvsee(plugin));
 //        Bukkit.getPluginCommand("clearinventory").setExecutor(new CommandClearInventory(plugin));
 //        Bukkit.getPluginCommand("time").setExecutor(new CommandTime(plugin));
 //        Bukkit.getPluginCommand("ptime").setExecutor(new CommandPTime(plugin));
-        Bukkit.getPluginCommand("broadcast").setExecutor(new CommandBroadcast(plugin));
-        Bukkit.getPluginCommand("list").setExecutor(new CommandList(plugin));
-        Bukkit.getPluginCommand("msg").setExecutor(new CommandMsg(plugin));
-        Bukkit.getPluginCommand("r").setExecutor(new CommandR(plugin));
-        Bukkit.getPluginCommand("mute").setExecutor(new CommandMute(plugin));
-        Bukkit.getPluginCommand("ignore").setExecutor(new CommandIgnore(plugin));
         Bukkit.getPluginCommand("vanish").setExecutor(new CommandVanish(plugin));
-        Bukkit.getPluginCommand("weather").setExecutor(new CommandWeather());
         Bukkit.getPluginCommand("bank").setExecutor(new CommandBank(plugin));
         Bukkit.getPluginCommand("balancetop").setExecutor(new CommandBalanceTop(plugin));
         Bukkit.getPluginCommand("fakequit").setExecutor(new CommandFakeQuit(plugin));

diff --git a/...entalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandBroadcast.java b/...entalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandBroadcast.java
diff --git a/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandHome.java b/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandHome.java
@@ -106,6 +106,10 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
                 commandSender.sendMessage(FundamentalsLanguage.getInstance().getMessage("home_in_invalid_world"));
                 return true;
             }
+            if (player.isSleeping()) {
+                commandSender.sendMessage(FundamentalsLanguage.getInstance().getMessage("home_is_sleeping"));
+                return true;
+            }
             Location home = targetPlayer.getPlayerHome(homeName);
             Location safeLocation;
             try {

diff --git a/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandIgnore.java b/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandIgnore.java
diff --git a/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandList.java b/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandList.java
diff --git a/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandMsg.java b/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandMsg.java
diff --git a/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandMute.java b/FundamentalsCore/src/main/java/com/johnymuffin/beta/fundamentals/commands/CommandMute.java