From f1fa6b16ad4ad8a70215536c28075e7997d4bb7f Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Fri, 12 Jul 2024 17:08:54 -0700 Subject: [PATCH] Fix formatting of Death & Pop notifications --- .../lncvrt/lncvrtbox/events/EntityResurrectListener.java | 2 +- .../github/lncvrt/lncvrtbox/events/PlayerDeathListener.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java index ad28ac8..0df0295 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java @@ -20,7 +20,7 @@ public class EntityResurrectListener implements Listener { public void onEntityResurrect(EntityResurrectEvent event) { if (event.getEntity() instanceof Player player && !event.isCancelled()) { if (player.getInventory().getItemInMainHand().getType() == Material.TOTEM_OF_UNDYING || player.getInventory().getItemInOffHand().getType() == Material.TOTEM_OF_UNDYING) { - plugin.getServer().broadcastMessage("%s%sLncvrtBoxFFA %s%s» %s%s has popped their totem".formatted(GOLD, BOLD, GRAY, BOLD, RESET, player.getName())); + plugin.getServer().broadcastMessage("%s%sLncvrtBox %s%s» %s%s has popped their totem".formatted(GOLD, BOLD, GRAY, BOLD, WHITE, player.getName())); } } } diff --git a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java b/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java index 26a7107..2cc3479 100644 --- a/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java +++ b/src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java @@ -5,15 +5,14 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.PlayerDeathEvent; import static org.bukkit.ChatColor.*; -import static org.bukkit.ChatColor.RESET; public class PlayerDeathListener implements Listener { @EventHandler public void onPlayerDeath(PlayerDeathEvent event) { String suicideMsg = ""; - if (event.getEntity() == event.getEntity().getKiller()) suicideMsg = RESET + " (suicide)"; + if (event.getEntity() == event.getEntity().getKiller()) suicideMsg = "%s (suicide)".formatted(RESET); - event.setDeathMessage("%s%sLncvrtBoxFFA %s%s» %s%s%s".formatted(GOLD, BOLD, GRAY, BOLD, RESET, event.getDeathMessage(), suicideMsg)); + event.setDeathMessage("%s%sLncvrtBoxFFA %s%s» %s%s%s".formatted(GOLD, BOLD, GRAY, BOLD, WHITE, event.getDeathMessage(), suicideMsg)); //Bukkit.getServer().broadcastMessage(event.getEntity().getKiller().getName()); } }