Now empty messages won't be broadcasted to in-game players (Resolves #17

)
Despical · Apr 14, 2024 · 5a1e2e5 · 5a1e2e5
1 parent c431dc2
commit 5a1e2e5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/me/despical/kotl/arena/Arena.java b/src/main/java/me/despical/kotl/arena/Arena.java
@@ -133,14 +133,9 @@ public void run() {
 	}
 
 	private Location setLocation(Location location, double x, double y, double z) {
-		try {
-			location.set(x, y, z);
-		} catch (Exception | Error e) {
-			location.setX(x);
-			location.setY(y);
-			location.setZ(z);
-		}
-
+		location.setX(x);
+		location.setY(y);
+		location.setZ(z);
 		return location;
 	}
 
@@ -277,6 +272,8 @@ public ScoreboardManager getScoreboardManager() {
 	}
 
 	public void broadcastMessage(String message) {
+		if (message.isEmpty() || message.equals(plugin.getChatManager().getPrefix())) return;
+
 		for (var player : players) player.sendMessage(message);
 	}
 

diff --git a/src/main/java/me/despical/kotl/events/ArenaEvents.java b/src/main/java/me/despical/kotl/events/ArenaEvents.java
@@ -144,7 +144,7 @@ public void onDeath(PlayerDeathEvent event) {
 
 		final var killerFound = deadPlayer.getKiller() != null;
 
-		arena.broadcastMessage(plugin.getChatManager().prefixedMessage("in_game." + (killerFound ? "killed_player" : "kill_command")).replace("%player%", killerFound ? deadPlayer.getKiller().getName() : "").replace("%victim%", deadPlayer.getName()));
+		arena.broadcastMessage(chatManager.prefixedMessage("in_game." + (killerFound ? "killed_player" : "kill_command")).replace("%player%", killerFound ? deadPlayer.getKiller().getName() : "").replace("%victim%", deadPlayer.getName()));
 	}
 
 	@EventHandler

diff --git a/src/main/java/me/despical/kotl/handlers/ChatManager.java b/src/main/java/me/despical/kotl/handlers/ChatManager.java
@@ -125,6 +125,10 @@ public void broadcastAction(Arena arena, Player player, ActionType action) {
 		arena.broadcastMessage(prefix + formatMessage(arena, message("in_game." + path), player));
 	}
 
+	public String getPrefix() {
+		return prefix;
+	}
+
 	public void reload() {
 		config = ConfigUtils.getConfig(plugin, "messages");
 		prefix = message("in_game.plugin_prefix");