GalaxyNetwork/GalaxyBoxPvP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatting of Death & Pop notifications

Browse Source
This commit is contained in:
Lncvrt
2024-07-12 17:08:54 -07:00
parent a81023e24d
commit f1fa6b16ad
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/lncvrt/lncvrtbox/events/EntityResurrectListener.java
View File

@@ -20,7 +20,7 @@ public class EntityResurrectListener implements Listener {
public void onEntityResurrect(EntityResurrectEvent event) { public void onEntityResurrect(EntityResurrectEvent event) {
if (event.getEntity() instanceof Player player && !event.isCancelled()) { 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) { 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()));
} }
} }
} }

5
src/main/java/io/github/lncvrt/lncvrtbox/events/PlayerDeathListener.java
View File

@@ -5,15 +5,14 @@ import org.bukkit.event.Listener;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import static org.bukkit.ChatColor.*; import static org.bukkit.ChatColor.*;
import static org.bukkit.ChatColor.RESET;
public class PlayerDeathListener implements Listener { public class PlayerDeathListener implements Listener {
@EventHandler @EventHandler
public void onPlayerDeath(PlayerDeathEvent event) { public void onPlayerDeath(PlayerDeathEvent event) {
String suicideMsg = ""; 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()); //Bukkit.getServer().broadcastMessage(event.getEntity().getKiller().getName());
} }
} }