Altitude/CometSkyBlock
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update IslandSetOwner.java

Browse Source
This commit is contained in:
Len 2024-02-10 23:25:50 +01:00
parent adacce0677
commit 52d8178e28
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java
View File

@ -24,7 +24,7 @@ public class IslandCommand extends PlayerSubCommand {
// registerSubCommand(new IslandTop(plugin)); // TODO -- Add IslandTopCommand // registerSubCommand(new IslandTop(plugin)); // TODO -- Add IslandTopCommand
registerSubCommand(new IslandInvite(plugin)); registerSubCommand(new IslandInvite(plugin));
registerSubCommand(new IslandKick(plugin)); // TODO -- Add IslandKickCommand registerSubCommand(new IslandKick(plugin)); // TODO -- Add IslandKickCommand
registerSubCommand(new IslandSetOwner(plugin)); // TODO -- Add some more output registerSubCommand(new IslandSetOwner(plugin));
registerSubCommand(new IslandVisit(plugin)); registerSubCommand(new IslandVisit(plugin));
} }

21
plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandSetOwner.java
View File

@ -2,6 +2,7 @@ package com.alttd.cometskyblock.commands.island;
import com.alttd.cometskyblock.CometSkyBlockPlugin; import com.alttd.cometskyblock.CometSkyBlockPlugin;
import com.alttd.cometskyblock.commands.PlayerSubCommand; import com.alttd.cometskyblock.commands.PlayerSubCommand;
import com.alttd.cometskyblock.configuration.MessageConfiguration;
import com.alttd.cometskyblock.island.Island; import com.alttd.cometskyblock.island.Island;
import com.alttd.cometskyblock.island.IslandPlayer; import com.alttd.cometskyblock.island.IslandPlayer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -17,31 +18,33 @@ public class IslandSetOwner extends PlayerSubCommand {
@Override @Override
public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) {
if (args.length < 1) { if (args.length < 1) {
// Wrong usage player.sendRichMessage(plugin.messagesConfiguration().get().commands().island().commandUsage());
return true; return true;
} }
MessageConfiguration.Commands.Island.SetOwner setOwner = plugin.messagesConfiguration().get().commands().island().setOwner();
if (!islandPlayer.islandOwner()) { if (!islandPlayer.islandOwner()) {
// You must be island owner to do this command. player.sendRichMessage(setOwner.notIslandOwner());
return true; return true;
} }
Player target = Bukkit.getPlayer(args[0]); Player target = Bukkit.getPlayer(args[0]);
if (target == null) { if (target == null) {
// Target is not online player.sendRichMessage(setOwner.targetOffline());
return true; return true;
} }
if (target == player) { if (target == player) {
// You are already the island owner. player.sendRichMessage(setOwner.playerIsOwner());
return true; return true;
} }
Island island = Island.getIsland(islandPlayer.islandUUID()); Island island = Island.getIsland(islandPlayer.islandUUID());
if (island == null) { if (island == null) {
// Could not load island, contact administrator player.sendRichMessage("<red>Could not load the island. Please contact an administrator!");
return true; return true;
} }
// if (!island.members().contains(target.getUniqueId())) { if (!island.members().contains(target.getUniqueId())) {
// // Target must be a member of your island player.sendRichMessage(setOwner.targetNotAMember());
// return true; return true;
// } }
// Todo - Notify online members about the change?
island.owner(target.getUniqueId()); island.owner(target.getUniqueId());
islandPlayer.islandOwner(false); islandPlayer.islandOwner(false);
IslandPlayer.getIslandPlayer(target.getUniqueId()).islandOwner(true); IslandPlayer.getIslandPlayer(target.getUniqueId()).islandOwner(true);

5
plugin/src/main/java/com/alttd/cometskyblock/configuration/MessageConfiguration.java
View File

@ -122,7 +122,10 @@ public class MessageConfiguration implements Configuration {
SetOwner setOwner = new SetOwner(); SetOwner setOwner = new SetOwner();
@ConfigSerializable @Getter @ConfigSerializable @Getter
public static class SetOwner { 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(); Visit visit = new Visit();