Fix messages when command sender is not a player

CuukyOfficial · Jan 1, 2025 · 127e01c · 127e01c
1 parent ea7b7a1
commit 127e01c
Show file tree

Hide file tree

Showing 37 changed files with 178 additions and 149 deletions.
diff --git a/src/main/java/de/cuuky/varo/command/essentials/BorderCommand.java b/src/main/java/de/cuuky/varo/command/essentials/BorderCommand.java
@@ -22,16 +22,16 @@ public class BorderCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command arg1, String arg2, String[] args) {
         VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null);
         if (!VersionUtils.getVersion().isHigherThan(ServerVersion.ONE_7)) {
-            Messages.COMMANDS_ERROR_WRONGVERSION.send(vp, Placeholder.constant("required-version", "1.8.8"));
+            Messages.COMMANDS_ERROR_WRONGVERSION.send(sender, Placeholder.constant("required-version", "1.8.8"));
             return false;
         }
 
         if (args.length == 0) {
-            Messages.COMMANDS_BORDER_SIZE.send(vp);
+            Messages.COMMANDS_BORDER_SIZE.send(sender);
             if (sender instanceof Player)
-                Messages.COMMANDS_BORDER_DISTANCE.send(vp);
+                Messages.COMMANDS_BORDER_DISTANCE.send(sender);
             if (sender.hasPermission("varo.setup")) {
-                Messages.COMMANDS_BORDER_USAGE.send(vp);
+                Messages.COMMANDS_BORDER_USAGE.send(sender);
             }
             return false;
         } else if (args.length >= 1 && sender.hasPermission("varo.setup")) {
@@ -50,7 +50,7 @@ public boolean onCommand(CommandSender sender, Command arg1, String arg2, String
             try {
                 borderSize = Integer.parseInt(args[0]);
             } catch (NumberFormatException e) {
-                Messages.COMMANDS_ERROR_NO_NUMBER.send(vp, Placeholder.constant("text", args[0]));
+                Messages.COMMANDS_ERROR_NO_NUMBER.send(sender, Placeholder.constant("text", args[0]));
                 return false;
             }
 
@@ -60,7 +60,7 @@ public boolean onCommand(CommandSender sender, Command arg1, String arg2, String
             } catch (ArrayIndexOutOfBoundsException e) {
                 worldHandler.setBorderSize(borderSize, 0, p != null ? p.getWorld() : null);
             } catch (NumberFormatException e) {
-                Messages.COMMANDS_ERROR_NO_NUMBER.send(vp, Placeholder.constant("text", args[1]));
+                Messages.COMMANDS_ERROR_NO_NUMBER.send(sender, Placeholder.constant("text", args[1]));
                 return false;
             }
 

diff --git a/src/main/java/de/cuuky/varo/command/essentials/BroadcastCommand.java b/src/main/java/de/cuuky/varo/command/essentials/BroadcastCommand.java
@@ -34,7 +34,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 			else
 				msg = arg;
 
-		Messages.COMMANDS_BROADCAST_FORMAT.send(vp, Placeholder.constant("message", ChatColor.translateAlternateColorCodes('&', msg)));
+		Messages.COMMANDS_BROADCAST_FORMAT.send(sender, Placeholder.constant("message", ChatColor.translateAlternateColorCodes('&', msg)));
 		return false;
 	}
 

diff --git a/src/main/java/de/cuuky/varo/command/essentials/CountdownCommand.java b/src/main/java/de/cuuky/varo/command/essentials/CountdownCommand.java
@@ -34,7 +34,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
             sched.cancel();
             sched = null;
 
-            Messages.COMMANDS_COUNTDOWN_ABORT.send(vp);
+            Messages.COMMANDS_COUNTDOWN_ABORT.send(sender);
             return false;
         }
 
@@ -47,11 +47,11 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
         try {
             time = Integer.parseInt(args[0]);
         } catch (NumberFormatException e) {
-            Messages.COMMANDS_ERROR_NO_NUMBER.send(vp, Placeholder.constant("text", args[0]));
+            Messages.COMMANDS_ERROR_NO_NUMBER.send(sender, Placeholder.constant("text", args[0]));
         }
 
         if (time < 1) {
-            Messages.COMMANDS_COUNTDOWN_TOO_SMALL.send(vp);
+            Messages.COMMANDS_COUNTDOWN_TOO_SMALL.send(sender);
             return false;
         }
 

diff --git a/src/main/java/de/cuuky/varo/command/essentials/DayCommand.java b/src/main/java/de/cuuky/varo/command/essentials/DayCommand.java
@@ -23,7 +23,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 
 		World world = sender instanceof Player ? ((Player) sender).getWorld() : Main.getVaroGame().getVaroWorldHandler().getMainWorld().getWorld();
 		world.setTime(1000);
-		Messages.COMMANDS_TIME_DAY.send(vp);
+		Messages.COMMANDS_TIME_DAY.send(sender);
 		return false;
 	}
 }
diff --git a/src/main/java/de/cuuky/varo/command/essentials/NightCommand.java b/src/main/java/de/cuuky/varo/command/essentials/NightCommand.java
@@ -23,7 +23,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 
 		World world = sender instanceof Player ? ((Player) sender).getWorld() : Main.getVaroGame().getVaroWorldHandler().getMainWorld().getWorld();
 		world.setTime(13000);
-		Messages.COMMANDS_TIME_NIGHT.send(vp);
+		Messages.COMMANDS_TIME_NIGHT.send(sender);
 		return false;
 	}
 }
diff --git a/src/main/java/de/cuuky/varo/command/essentials/PingCommand.java b/src/main/java/de/cuuky/varo/command/essentials/PingCommand.java
@@ -17,7 +17,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String ping, String[
 		VaroPlayer vp = (sender instanceof Player ? VaroPlayer.getPlayer((Player) sender) : null);
 		if (args.length == 0) {
 			if (!(sender instanceof Player)) {
-				Messages.COMMANDS_ERROR_NO_CONSOLE.send(vp);
+				Messages.COMMANDS_ERROR_NO_CONSOLE.send(sender);
 				return false;
 			}
 
@@ -30,11 +30,11 @@ public boolean onCommand(CommandSender sender, Command cmd, String ping, String[
 
 			VaroPlayer target = VaroPlayer.getPlayer(args[0]);
 			if (target == null || !target.isOnline()) {
-				Messages.COMMANDS_ERROR_UNKNOWN_PLAYER.send(vp);
+				Messages.COMMANDS_ERROR_UNKNOWN_PLAYER.send(sender);
 				return false;
 			}
 
-			Messages.COMMANDS_PING.send(vp, target);
+			Messages.COMMANDS_PING.send(sender, target);
 		} else
 			sender.sendMessage(Main.getPrefix() + Main.getColorCode() + "/ping §7[player]");
 

diff --git a/src/main/java/de/cuuky/varo/command/essentials/RainCommand.java b/src/main/java/de/cuuky/varo/command/essentials/RainCommand.java
@@ -25,7 +25,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 
 		world.setStorm(true);
 		world.setThundering(false);
-		Messages.COMMANDS_WEATHER_RAIN.send(vp);
+		Messages.COMMANDS_WEATHER_RAIN.send(sender);
 		return false;
 	}
 }
diff --git a/src/main/java/de/cuuky/varo/command/essentials/SetWorldspawnCommand.java b/src/main/java/de/cuuky/varo/command/essentials/SetWorldspawnCommand.java
@@ -39,7 +39,7 @@ public boolean onCommand(CommandSender sender, Command arg1, String arg2, String
 		if(border != null)
 			border.setCenter(p.getLocation());
 
-		Messages.COMMANDS_SETWORLDSPAWN.send(vp);
+		Messages.COMMANDS_SETWORLDSPAWN.send(sender);
 		p.playSound(p.getLocation(), XSound.BLOCK_NOTE_BLOCK_BASEDRUM.parseSound(), 1, 1);
 		return false;
 	}

diff --git a/src/main/java/de/cuuky/varo/command/essentials/SunCommand.java b/src/main/java/de/cuuky/varo/command/essentials/SunCommand.java
@@ -25,7 +25,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 
 		world.setStorm(false);
 		world.setThundering(false);
-		Messages.COMMANDS_WEATHER_SUN.send(vp);
+		Messages.COMMANDS_WEATHER_SUN.send(sender);
 		return false;
 	}
 

diff --git a/src/main/java/de/cuuky/varo/command/essentials/ThunderCommand.java b/src/main/java/de/cuuky/varo/command/essentials/ThunderCommand.java
@@ -25,7 +25,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 
 		world.setStorm(true);
 		world.setThundering(true);
-		Messages.COMMANDS_WEATHER_THUNDER.send(vp);
+		Messages.COMMANDS_WEATHER_THUNDER.send(sender);
 		return false;
 	}
 

diff --git a/src/main/java/de/cuuky/varo/command/varo/AbortCommand.java b/src/main/java/de/cuuky/varo/command/varo/AbortCommand.java
@@ -19,12 +19,12 @@ public AbortCommand() {
 	@Override
 	public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String label, String[] args) {
 		if (!Main.getVaroGame().isStarting()) {
-			Messages.COMMANDS_VARO_ABORT_COUNTDOWN_NOT_ACTIVE.send(vp);
+			Messages.COMMANDS_VARO_ABORT_COUNTDOWN_NOT_ACTIVE.send(sender);
 			return;
 		}
 
 		Main.getVaroGame().abort();
 		Bukkit.getOnlinePlayers().forEach(player -> LobbyItem.giveItems(player));
-		Messages.COMMANDS_VARO_ABORT_COUNTDOWN_STOPPED.send(vp);
+		Messages.COMMANDS_VARO_ABORT_COUNTDOWN_STOPPED.send(sender);
 	}
 }
diff --git a/src/main/java/de/cuuky/varo/command/varo/ActionbarCommand.java b/src/main/java/de/cuuky/varo/command/varo/ActionbarCommand.java
@@ -17,23 +17,23 @@ public ActionbarCommand() {
 	@Override
 	public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String label, String[] args) {
 		if (vp == null) {
-			Messages.COMMANDS_ERROR_NO_CONSOLE.send(vp);
+			Messages.COMMANDS_ERROR_NO_CONSOLE.send(sender);
 			return;
 		}
 
 		if (!ConfigSetting.ACTIONBAR_ENABLED.getValueAsBoolean() || vp.getActionbar() == null) {
-			Messages.COMMANDS_VARO_ACTIONBAR_DEACTIVATED.send(vp);
+			Messages.COMMANDS_VARO_ACTIONBAR_DEACTIVATED.send(sender);
 			return;
 		}
 
 		if (vp.getStats().isShowActionbar()) {
 			vp.getStats().setShowActionbar(false);
 			vp.getActionbar().setEnabled(false);
-			Messages.COMMANDS_VARO_ACTIONBAR_DISABLED.send(vp);
+			Messages.COMMANDS_VARO_ACTIONBAR_DISABLED.send(sender);
 		} else {
 			vp.getStats().setShowActionbar(true);
 			vp.getActionbar().setEnabled(true);
-			Messages.COMMANDS_VARO_ACTIONBAR_ENABLED.send(vp);
+			Messages.COMMANDS_VARO_ACTIONBAR_ENABLED.send(sender);
 		}
 	}
 }
diff --git a/src/main/java/de/cuuky/varo/command/varo/AutoSetupCommand.java b/src/main/java/de/cuuky/varo/command/varo/AutoSetupCommand.java
@@ -21,20 +21,20 @@ public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String l
 		if (args.length >= 1) {
 			if (args[0].equalsIgnoreCase("run")) {
 				if (!ConfigSetting.AUTOSETUP_ENABLED.getValueAsBoolean()) {
-					Messages.COMMANDS_VARO_AUTOSETUP_NOT_SETUP_YET.send(vp);
+					Messages.COMMANDS_VARO_AUTOSETUP_NOT_SETUP_YET.send(sender);
 					return;
 				}
 
 				new AutoSetup(()-> {
 					for (VaroPlayer player : VaroPlayer.getOnlinePlayer())
 						player.saveTeleport(Main.getVaroGame().getVaroWorldHandler().getTeleportLocation());
 
-					Messages.COMMANDS_VARO_AUTOSETUP_FINISHED.send(vp);
+					Messages.COMMANDS_VARO_AUTOSETUP_FINISHED.send(sender);
 				});
 				return;
 			}
 		}
 
-		Messages.COMMANDS_VARO_AUTOSETUP_HELP.send(vp);
+		Messages.COMMANDS_VARO_AUTOSETUP_HELP.send(sender);
 	}
 }
diff --git a/src/main/java/de/cuuky/varo/command/varo/AutoStartCommand.java b/src/main/java/de/cuuky/varo/command/varo/AutoStartCommand.java
@@ -28,28 +28,28 @@ public AutoStartCommand() {
 	@Override
 	public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String label, String[] args) {
 		if (Main.getVaroGame().hasStarted()) {
-			Messages.COMMANDS_VARO_AUTOSTART_ALREADY_STARTED.send(vp);
+			Messages.COMMANDS_VARO_AUTOSTART_ALREADY_STARTED.send(sender);
 			return;
 		}
 
 		if (args.length == 0) {
-		    Messages.CATEGORY_HEADER.send(vp, Placeholder.constant("category", "Autostart"));
+		    Messages.CATEGORY_HEADER.send(sender, Placeholder.constant("category", "Autostart"));
 			sender.sendMessage(Main.getPrefix() + Main.getColorCode() + "/" + ConfigSetting.COMMAND_VARO_NAME.getValueAsString() + " autostart §7info");
 			sender.sendMessage(Main.getPrefix() + Main.getColorCode() + "/" + ConfigSetting.COMMAND_VARO_NAME.getValueAsString() + " autostart §7set <Hour> <Minute> <Day> <Month> <Year>");
 			sender.sendMessage(Main.getPrefix() + Main.getColorCode() + "/" + ConfigSetting.COMMAND_VARO_NAME.getValueAsString() + " autostart §7remove");
 			sender.sendMessage(Main.getPrefix() + Main.getColorCode() + "/" + ConfigSetting.COMMAND_VARO_NAME.getValueAsString() + " autostart §7delay <Minutes>");
-			Messages.CATEGORY_FOOTER.send(vp, Placeholder.constant("category", "Autostart"));
+			Messages.CATEGORY_FOOTER.send(sender, Placeholder.constant("category", "Autostart"));
 			return;
 		}
 
 		if (args[0].equalsIgnoreCase("set")) {
 			if (Main.getVaroGame().getAutoStart() != null) {
-			    Messages.COMMANDS_VARO_AUTOSTART_ALREADY_SETUP.send(vp);
+			    Messages.COMMANDS_VARO_AUTOSTART_ALREADY_SETUP.send(sender);
 				return;
 			}
 
 			if (args.length != 6) {
-			    Messages.COMMANDS_VARO_AUTOSTART_HELP_SET.send(vp);
+			    Messages.COMMANDS_VARO_AUTOSTART_HELP_SET.send(sender);
 				return;
 			}
 
@@ -64,59 +64,59 @@ public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String l
 				month = Integer.parseInt(args[4]) - 1;
 				year = Integer.parseInt(args[5]);
 			} catch (NumberFormatException e) {
-				Messages.COMMANDS_VARO_AUTOSTART_NO_NUMBER.send(vp);
+				Messages.COMMANDS_VARO_AUTOSTART_NO_NUMBER.send(sender);
 				return;
 			}
 
 			Calendar start = new GregorianCalendar(year, month, day, hour, min, 0);
 			if (new GregorianCalendar().after(start)) {
-				Messages.COMMANDS_VARO_AUTOSTART_DATE_IN_THE_PAST.send(vp);
+				Messages.COMMANDS_VARO_AUTOSTART_DATE_IN_THE_PAST.send(sender);
 				return;
 			}
 
 			Main.getVaroGame().setAutoStart(new AutoStart(start));
 			return;
 		} else if (args[0].equalsIgnoreCase("remove")) {
 			if (Main.getVaroGame().getAutoStart() == null) {
-				Messages.COMMANDS_VARO_AUTOSTART_NOT_SETUP_YET.send(vp);
+				Messages.COMMANDS_VARO_AUTOSTART_NOT_SETUP_YET.send(sender);
 				return;
 			}
 
 			Main.getVaroGame().getAutoStart().stop();
-			Messages.COMMANDS_VARO_AUTOSTART_REMOVED.send(vp);
+			Messages.COMMANDS_VARO_AUTOSTART_REMOVED.send(sender);
 		} else if (args[0].equalsIgnoreCase("delay")) {
 			if (Main.getVaroGame().getAutoStart() == null) {
-				Messages.COMMANDS_VARO_AUTOSTART_NOT_SETUP_YET.send(vp);
+				Messages.COMMANDS_VARO_AUTOSTART_NOT_SETUP_YET.send(sender);
 				return;
 			}
 
 			if (args.length < 2) {
-				Messages.COMMANDS_VARO_AUTOSTART_DELAY_HELP.send(vp);
+				Messages.COMMANDS_VARO_AUTOSTART_DELAY_HELP.send(sender);
 				return;
 			}
 
 			int delay = -1;
 			try {
 				delay = Integer.parseInt(args[1]);
 			} catch (NumberFormatException e) {
-				Messages.COMMANDS_ERROR_NO_NUMBER.send(vp, Placeholder.constant("text", args[1]));
+				Messages.COMMANDS_ERROR_NO_NUMBER.send(sender, Placeholder.constant("text", args[1]));
 				return;
 			}
 
 			if (delay < 1) {
-				Messages.COMMANDS_VARO_AUTOSTART_DELAY_TO_SMALL.send(vp);
+				Messages.COMMANDS_VARO_AUTOSTART_DELAY_TO_SMALL.send(sender);
 				return;
 			}
 
 			Main.getVaroGame().getAutoStart().delay(delay);
-            Messages.COMMANDS_VARO_AUTOSTART_START_DELAYED.send(vp, Placeholder.constant("autostart-delay", String.valueOf(delay)));
+            Messages.COMMANDS_VARO_AUTOSTART_START_DELAYED.send(sender, Placeholder.constant("autostart-delay", String.valueOf(delay)));
 		} else if (args[0].equalsIgnoreCase("info")) {
 			if (Main.getVaroGame().getAutoStart() == null)
-			    Messages.COMMANDS_VARO_AUTOSTART_INACTIVE.send(vp);
+			    Messages.COMMANDS_VARO_AUTOSTART_INACTIVE.send(sender);
 			else
-			    Messages.COMMANDS_VARO_AUTOSTART_INFO.send(vp, Placeholder.constant("autostart-date", new SimpleDateFormat("dd.MM.yyyy HH.mm").format(Main.getVaroGame().getAutoStart().getStart().toString())));
+			    Messages.COMMANDS_VARO_AUTOSTART_INFO.send(sender, Placeholder.constant("autostart-date", new SimpleDateFormat("dd.MM.yyyy HH.mm").format(Main.getVaroGame().getAutoStart().getStart().toString())));
 		} else
-		    Messages.COMMANDS_ERROR_USAGE.send(vp, Placeholder.constant("command", "autostart"));
+		    Messages.COMMANDS_ERROR_USAGE.send(sender, Placeholder.constant("command", "autostart"));
 		return;
 
 	}

diff --git a/src/main/java/de/cuuky/varo/command/varo/BackpackCommand.java b/src/main/java/de/cuuky/varo/command/varo/BackpackCommand.java
@@ -53,12 +53,12 @@ private void teamBackPack(VaroPlayer vp, String[] args, int number) {
 	@Override
 	public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String label, String[] args) {
 		if (!Main.getVaroGame().hasStarted()) {
-			Messages.COMMANDS_ERROR_NOT_STARTED.send(vp);
+			Messages.COMMANDS_ERROR_NOT_STARTED.send(sender);
 			return;
 		}
 
 		if (vp == null) {
-			Messages.COMMANDS_ERROR_NO_CONSOLE.send(vp);
+			Messages.COMMANDS_ERROR_NO_CONSOLE.send(sender);
 			return;
 		}
 

diff --git a/src/main/java/de/cuuky/varo/command/varo/BugreportCommand.java b/src/main/java/de/cuuky/varo/command/varo/BugreportCommand.java
@@ -23,17 +23,17 @@ public BugreportCommand() {
 	public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String label, String[] args) {
 		if (Main.getVaroUpdater() != null && Main.getVaroUpdater().getLastResult() != null
 		        &&  Main.getVaroUpdater().getLastResult().getUpdateResult() == UpdateResult.UPDATE_AVAILABLE) {
-			Messages.COMMANDS_VARO_BUGREPORT_UPDATE.send(vp);
+			Messages.COMMANDS_VARO_BUGREPORT_UPDATE.send(sender);
 			return;
 		}
 
-		Messages.COMMANDS_VARO_BUGREPORT_COLLECTING_DATA.send(vp);
+		Messages.COMMANDS_VARO_BUGREPORT_COLLECTING_DATA.send(sender);
 		File bugReport = BugReport.createBugReport();
 		if (bugReport == null) {
-			Messages.COMMANDS_ERROR_GENERIC.send(vp);
+			Messages.COMMANDS_ERROR_GENERIC.send(sender);
 			return;
 		}
 
-		Messages.COMMANDS_VARO_BUGREPORT_CREATED.send(vp, Placeholder.constant("file", bugReport.getAbsolutePath()));
+		Messages.COMMANDS_VARO_BUGREPORT_CREATED.send(sender, Placeholder.constant("file", bugReport.getAbsolutePath()));
 	}
 }
diff --git a/src/main/java/de/cuuky/varo/command/varo/CheckCombatCommand.java b/src/main/java/de/cuuky/varo/command/varo/CheckCombatCommand.java
@@ -17,19 +17,19 @@ public CheckCombatCommand() {
     @Override
     public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String label, String[] args) {
         if (vp == null) {
-        	Messages.COMMANDS_ERROR_NO_CONSOLE.send(vp);
+        	Messages.COMMANDS_ERROR_NO_CONSOLE.send(sender);
             return;
         }
 
         if (args.length != 0) {
-            Messages.COMMANDS_VARO_CHECKCOMBAT_HELP.send(vp);
+            Messages.COMMANDS_VARO_CHECKCOMBAT_HELP.send(sender);
             return;
         }
 
         if (new CombatlogCheck(vp.getPlayer()).isCombatLog()) {
-            Messages.COMMANDS_VARO_CHECKCOMBAT_INCOMBAT.send(vp);
+            Messages.COMMANDS_VARO_CHECKCOMBAT_INCOMBAT.send(sender);
         } else {
-            Messages.COMMANDS_VARO_CHECKCOMBAT_NOTINCOMBAT.send(vp);
+            Messages.COMMANDS_VARO_CHECKCOMBAT_NOTINCOMBAT.send(sender);
         }
     }