Petit clean up du /is chat

Author: Euphillya

addons/SkylliaChat/src/main/java/fr/euphyllia/skylliachat/ChatListeners.java

@@ -12,6 +12,9 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+import java.util.UUID;
 
 public class ChatListeners implements Listener {
 
@@ -22,23 +25,32 @@ public ChatListeners(SkylliaChat plugin) {
         this.plugin = plugin;
     }
 
+    @EventHandler
+    public void onPlayerQuit(final PlayerQuitEvent event) {
+        final Player player = event.getPlayer();
+        final UUID uuid = player.getUniqueId();
+        plugin.getIslandChatEnabled().remove(uuid);
+    }
+
     @EventHandler
     public void onPlayerChat(final AsyncPlayerChatEvent event) {
-        Player player = event.getPlayer();
+        final Player player = event.getPlayer();
+        final UUID uuid = player.getUniqueId();
+        final String playerName = player.getName();
 
-        if (plugin.getIslandChatEnabled().getOrDefault(player, false)) {
+        if (plugin.getIslandChatEnabled().getOrDefault(uuid, false)) {
             event.setCancelled(true);
 
             Bukkit.getAsyncScheduler().runNow(plugin, scheduledTask -> {
-                Island island = SkylliaAPI.getIslandByPlayerId(player.getUniqueId());
+                Island island = SkylliaAPI.getIslandByPlayerId(uuid);
                 if (island == null) {
                     ConfigLoader.language.sendMessage(player, "island.player.no-island");
                     return;
                 }
 
                 String message = event.getMessage();
                 String format = this.plugin.getConfig().getString("chat.format", "<red>[Messaging Island] %player_name%: <gray>%message%")
-                        .replace("%player_name%", player.getName())
+                        .replace("%player_name%", playerName)
                         .replace("%message%", message);
 
                 // MiniMessage doesn't like legacy formatting codes...

addons/SkylliaChat/src/main/java/fr/euphyllia/skylliachat/SkylliaChat.java

@@ -3,14 +3,14 @@
 import fr.euphyllia.skyllia.api.SkylliaAPI;
 import fr.euphyllia.skylliachat.commands.IslandChatCommand;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 public final class SkylliaChat extends JavaPlugin {
 
-    private final ConcurrentHashMap<Player, Boolean> islandChatEnabled = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<UUID, Boolean> islandChatEnabled = new ConcurrentHashMap<>();
 
     @Override
     public void onEnable() {
@@ -25,7 +25,7 @@ public void onDisable() {
         Bukkit.getGlobalRegionScheduler().cancelTasks(this);
     }
 
-    public ConcurrentHashMap<Player, Boolean> getIslandChatEnabled() {
+    public ConcurrentHashMap<UUID, Boolean> getIslandChatEnabled() {
         return islandChatEnabled;
     }
 }

addons/SkylliaChat/src/main/java/fr/euphyllia/skylliachat/commands/IslandChatCommand.java

@@ -10,6 +10,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 
 public class IslandChatCommand implements SubCommandInterface {
 
@@ -29,10 +30,11 @@ public boolean onCommand(@NotNull Plugin plugin, @NotNull CommandSender sender,
             ConfigLoader.language.sendMessage(player, "addons.chat.no-permission");
             return true;
         }
+        final UUID uuid = player.getUniqueId();
 
         // Toggle island chat mode
-        boolean isEnabled = this.plugin.getIslandChatEnabled().getOrDefault(player, false);
-        this.plugin.getIslandChatEnabled().put(player, !isEnabled);
+        boolean isEnabled = this.plugin.getIslandChatEnabled().getOrDefault(uuid, false);
+        this.plugin.getIslandChatEnabled().put(uuid, !isEnabled);
 
         if (isEnabled) {
             ConfigLoader.language.sendMessage(player, "addons.chat.disabled");