From 52d8178e283a48ad0ae38839ef8c7a0942480233 Mon Sep 17 00:00:00 2001
From: Len <40720638+destro174@users.noreply.github.com>
Date: Sat, 10 Feb 2024 23:25:50 +0100
Subject: [PATCH] Update IslandSetOwner.java

---
 .../commands/island/IslandCommand.java        |  2 +-
 .../commands/island/IslandSetOwner.java       | 21 +++++++++++--------
 .../configuration/MessageConfiguration.java   |  5 ++++-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java
index 37aec8b..ffb8dae 100644
--- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java
+++ b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java
@@ -24,7 +24,7 @@ public class IslandCommand extends PlayerSubCommand {
 //        registerSubCommand(new IslandTop(plugin)); // TODO -- Add IslandTopCommand
         registerSubCommand(new IslandInvite(plugin));
         registerSubCommand(new IslandKick(plugin)); // TODO -- Add IslandKickCommand
-        registerSubCommand(new IslandSetOwner(plugin)); // TODO -- Add some more output
+        registerSubCommand(new IslandSetOwner(plugin));
         registerSubCommand(new IslandVisit(plugin));
     }
 
diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandSetOwner.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandSetOwner.java
index 5b2a69f..d03093c 100644
--- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandSetOwner.java
+++ b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandSetOwner.java
@@ -2,6 +2,7 @@ package com.alttd.cometskyblock.commands.island;
 
 import com.alttd.cometskyblock.CometSkyBlockPlugin;
 import com.alttd.cometskyblock.commands.PlayerSubCommand;
+import com.alttd.cometskyblock.configuration.MessageConfiguration;
 import com.alttd.cometskyblock.island.Island;
 import com.alttd.cometskyblock.island.IslandPlayer;
 import org.bukkit.Bukkit;
@@ -17,31 +18,33 @@ public class IslandSetOwner extends PlayerSubCommand {
     @Override
     public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) {
         if (args.length < 1) {
-            // Wrong usage
+            player.sendRichMessage(plugin.messagesConfiguration().get().commands().island().commandUsage());
             return true;
         }
+        MessageConfiguration.Commands.Island.SetOwner setOwner = plugin.messagesConfiguration().get().commands().island().setOwner();
         if (!islandPlayer.islandOwner()) {
-            // You must be island owner to do this command.
+            player.sendRichMessage(setOwner.notIslandOwner());
             return true;
         }
         Player target = Bukkit.getPlayer(args[0]);
         if (target == null) {
-            // Target is not online
+            player.sendRichMessage(setOwner.targetOffline());
             return true;
         }
         if (target == player) {
-            // You are already the island owner.
+            player.sendRichMessage(setOwner.playerIsOwner());
             return true;
         }
         Island island = Island.getIsland(islandPlayer.islandUUID());
         if (island == null) {
-            // Could not load island, contact administrator
+            player.sendRichMessage("<red>Could not load the island. Please contact an administrator!");
             return true;
         }
-//        if (!island.members().contains(target.getUniqueId())) {
-//            // Target must be a member of your island
-//            return true;
-//        }
+        if (!island.members().contains(target.getUniqueId())) {
+            player.sendRichMessage(setOwner.targetNotAMember());
+            return true;
+        }
+        // Todo - Notify online members about the change?
         island.owner(target.getUniqueId());
         islandPlayer.islandOwner(false);
         IslandPlayer.getIslandPlayer(target.getUniqueId()).islandOwner(true);
diff --git a/plugin/src/main/java/com/alttd/cometskyblock/configuration/MessageConfiguration.java b/plugin/src/main/java/com/alttd/cometskyblock/configuration/MessageConfiguration.java
index 80dead7..c110cf3 100644
--- a/plugin/src/main/java/com/alttd/cometskyblock/configuration/MessageConfiguration.java
+++ b/plugin/src/main/java/com/alttd/cometskyblock/configuration/MessageConfiguration.java
@@ -122,7 +122,10 @@ public class MessageConfiguration implements Configuration {
             SetOwner setOwner = new SetOwner();
             @ConfigSerializable @Getter
             public static class SetOwner {
-
+                String notIslandOwner = "<red>You must be the island owner to do this.";
+                String targetOffline = "<red><target> not found, is the player online?";
+                String playerIsOwner = "<red>You are already the island owner.";
+                String targetNotAMember = "<red><target> must be a member of your island.";
             }
 
             Visit visit = new Visit();