From ea8f712c3572450be2a0b45be5bb147eb4bb32d9 Mon Sep 17 00:00:00 2001 From: PainOchoco Date: Sun, 13 Nov 2022 15:23:44 +0100 Subject: [PATCH] Added first join message --- .../townychat/listeners/MiscListener.java | 11 +++++++---- src/main/resources/config.yml | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/laboulangerie/townychat/listeners/MiscListener.java b/src/main/java/net/laboulangerie/townychat/listeners/MiscListener.java index 7674417..7903251 100644 --- a/src/main/java/net/laboulangerie/townychat/listeners/MiscListener.java +++ b/src/main/java/net/laboulangerie/townychat/listeners/MiscListener.java @@ -2,6 +2,7 @@ import org.bukkit.advancement.Advancement; import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerAdvancementDoneEvent; @@ -28,8 +29,6 @@ public MiscListener() { @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { - String joinString = miscSection.getString("join_message"); - event.joinMessage(null); // Wait for Towny to create new resident @@ -37,8 +36,12 @@ public void onPlayerJoin(PlayerJoinEvent event) { @Override public void run() { - Component joinComponent = componentRenderer.parse(event.getPlayer(), joinString, - Placeholder.component("username", event.getPlayer().name())); + Player player = event.getPlayer(); + String joinString = player.hasPlayedBefore() + ? miscSection.getString("join_message") + : miscSection.getString("first_join_message"); + Component joinComponent = componentRenderer.parse(player, joinString, + Placeholder.component("username", player.name())); TownyChat.PLUGIN.getServer().broadcast(joinComponent); } }.runTaskLater(TownyChat.PLUGIN, 5); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 9130514..928a14b 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -74,6 +74,7 @@ blacklist: # MiniMessage, Placeholders and Tags can be used here misc: + first_join_message: "➔ Bienvenue " join_message: "→ " quit_message: "← " advancement: