From 0184867a61fa675f676889d095974ca33e65894d Mon Sep 17 00:00:00 2001 From: kaboom <58372747+kaboombot@users.noreply.github.com> Date: Fri, 20 May 2022 05:21:46 +0300 Subject: [PATCH] Use spaces instead of tabs --- pom.xml | 96 ++--- .../pw/kaboom/icontrolu/ControlPlayer.java | 360 +++++++++--------- src/main/java/pw/kaboom/icontrolu/Main.java | 62 +-- .../kaboom/icontrolu/commands/CommandIcu.java | 148 +++---- .../icontrolu/utilities/PlayerList.java | 44 +-- suppressions.xml | 9 +- 6 files changed, 359 insertions(+), 360 deletions(-) diff --git a/pom.xml b/pom.xml index abbadd7..6969825 100644 --- a/pom.xml +++ b/pom.xml @@ -1,55 +1,55 @@ - 4.0.0 - pw.kaboom - iControlU - master + 4.0.0 + pw.kaboom + iControlU + master - - 1.8 - 1.8 - true - UTF-8 - + + 1.8 + 1.8 + true + UTF-8 + - - - com.destroystokyo.paper - paper-api - 1.15.2-R0.1-SNAPSHOT - - + + + com.destroystokyo.paper + paper-api + 1.15.2-R0.1-SNAPSHOT + + - - - papermc - https://papermc.io/repo/repository/maven-public/ - - + + + papermc + https://papermc.io/repo/repository/maven-public/ + + - - ${project.artifactId} - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.1.2 - - - checkstyle - validate - - check - - - - suppressions.xml - - true - - - - - - + + ${project.artifactId} + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.2 + + + checkstyle + validate + + check + + + + suppressions.xml + + true + + + + + + diff --git a/src/main/java/pw/kaboom/icontrolu/ControlPlayer.java b/src/main/java/pw/kaboom/icontrolu/ControlPlayer.java index ed2d0a7..4ed869d 100644 --- a/src/main/java/pw/kaboom/icontrolu/ControlPlayer.java +++ b/src/main/java/pw/kaboom/icontrolu/ControlPlayer.java @@ -26,230 +26,230 @@ import org.bukkit.scoreboard.Team; import pw.kaboom.icontrolu.utilities.PlayerList; class Tick extends BukkitRunnable { - @Override - @SuppressWarnings("deprecation") - public void run() { - for (Player target: Bukkit.getOnlinePlayers()) { - final Player controller = PlayerList.getController(target.getUniqueId()); + @Override + @SuppressWarnings("deprecation") + public void run() { + for (Player target: Bukkit.getOnlinePlayers()) { + final Player controller = PlayerList.getController(target.getUniqueId()); - if (controller != null) { - for (int i = 0; i < controller.getInventory().getSize(); i++) { - if (controller.getInventory().getItem(i) != null) { - if (!controller.getInventory().getItem(i).equals(target.getInventory().getItem(i))) { - target.getInventory().setItem(i, controller.getInventory().getItem(i)); - } - } else { - target.getInventory().setItem(i, null); - } - } + if (controller != null) { + for (int i = 0; i < controller.getInventory().getSize(); i++) { + if (controller.getInventory().getItem(i) != null) { + if (!controller.getInventory().getItem(i).equals(target.getInventory().getItem(i))) { + target.getInventory().setItem(i, controller.getInventory().getItem(i)); + } + } else { + target.getInventory().setItem(i, null); + } + } - if (target.getHealth() > 0) { - target.teleportAsync(controller.getLocation()); - } + if (target.getHealth() > 0) { + target.teleportAsync(controller.getLocation()); + } - target.setAllowFlight(controller.getAllowFlight()); - target.setExhaustion(controller.getExhaustion()); - target.setFlying(controller.isFlying()); - target.setFoodLevel(controller.getFoodLevel()); + target.setAllowFlight(controller.getAllowFlight()); + target.setExhaustion(controller.getExhaustion()); + target.setFlying(controller.isFlying()); + target.setFoodLevel(controller.getFoodLevel()); - if (controller.getMaxHealth() > 0) { - target.setMaxHealth(controller.getMaxHealth()); - target.setHealth(controller.getHealth()); - } + if (controller.getMaxHealth() > 0) { + target.setMaxHealth(controller.getMaxHealth()); + target.setHealth(controller.getHealth()); + } - target.setLevel(controller.getLevel()); - target.setSneaking(controller.isSneaking()); - target.setSprinting(controller.isSprinting()); + target.setLevel(controller.getLevel()); + target.setSneaking(controller.isSneaking()); + target.setSprinting(controller.isSprinting()); - for (Player player: Bukkit.getOnlinePlayers()) { - player.hidePlayer(JavaPlugin.getPlugin(Main.class), controller); - } + for (Player player: Bukkit.getOnlinePlayers()) { + player.hidePlayer(JavaPlugin.getPlugin(Main.class), controller); + } - final Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); - Team team = scoreboard.getTeam("icuCollision"); + final Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); + Team team = scoreboard.getTeam("icuCollision"); - if (team == null) { - team = scoreboard.registerNewTeam("icuCollision"); - } + if (team == null) { + team = scoreboard.registerNewTeam("icuCollision"); + } - team.setCanSeeFriendlyInvisibles(false); - team.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.NEVER); + team.setCanSeeFriendlyInvisibles(false); + team.setOption(Team.Option.COLLISION_RULE, Team.OptionStatus.NEVER); - if (!team.hasEntry(controller.getName())) { - team.addEntry(controller.getName()); - } + if (!team.hasEntry(controller.getName())) { + team.addEntry(controller.getName()); + } - final int duration = 99999; - final int amplifier = 0; - final boolean ambient = false; - final boolean particles = false; + final int duration = 99999; + final int amplifier = 0; + final boolean ambient = false; + final boolean particles = false; - controller.addPotionEffect( - new PotionEffect( - PotionEffectType.INVISIBILITY, - duration, - amplifier, - ambient, - particles - ) - ); - } - } - } + controller.addPotionEffect( + new PotionEffect( + PotionEffectType.INVISIBILITY, + duration, + amplifier, + ambient, + particles + ) + ); + } + } + } } class ControlPlayer implements Listener { - @EventHandler - private void onAsyncPlayerChat(final AsyncPlayerChatEvent event) { - final Player player = event.getPlayer(); + @EventHandler + private void onAsyncPlayerChat(final AsyncPlayerChatEvent event) { + final Player player = event.getPlayer(); - if (PlayerList.getController(player.getUniqueId()) != null) { - if (event.getMessage().startsWith("§iControlUChat§")) { - final int prefixLength = "§iControlUChat§".length(); + if (PlayerList.getController(player.getUniqueId()) != null) { + if (event.getMessage().startsWith("§iControlUChat§")) { + final int prefixLength = "§iControlUChat§".length(); - event.setMessage( - event.getMessage().substring(prefixLength) - ); - } else { - event.setCancelled(true); - } + event.setMessage( + event.getMessage().substring(prefixLength) + ); + } else { + event.setCancelled(true); + } - } else if (PlayerList.getTarget(player.getUniqueId()) != null) { - final Player target = PlayerList.getTarget(player.getUniqueId()); + } else if (PlayerList.getTarget(player.getUniqueId()) != null) { + final Player target = PlayerList.getTarget(player.getUniqueId()); - new BukkitRunnable() { - @Override - public void run() { - target.chat("§iControlUChat§" + event.getMessage()); // Add prefix to prevent messages from being cancelled - } - }.runTask(JavaPlugin.getPlugin(Main.class)); + new BukkitRunnable() { + @Override + public void run() { + target.chat("§iControlUChat§" + event.getMessage()); // Add prefix to prevent messages from being cancelled + } + }.runTask(JavaPlugin.getPlugin(Main.class)); - event.setCancelled(true); - } - } + event.setCancelled(true); + } + } - @EventHandler - private void onEntityDamage(final EntityDamageEvent event) { - final Entity player = event.getEntity(); + @EventHandler + private void onEntityDamage(final EntityDamageEvent event) { + final Entity player = event.getEntity(); - if (PlayerList.getTarget(player.getUniqueId()) != null) { - event.setCancelled(true); - } - } + if (PlayerList.getTarget(player.getUniqueId()) != null) { + event.setCancelled(true); + } + } - @EventHandler - private void onPlayerAnimation(final PlayerAnimationEvent event) { - final Player player = event.getPlayer(); + @EventHandler + private void onPlayerAnimation(final PlayerAnimationEvent event) { + final Player player = event.getPlayer(); - if (PlayerList.getController(player.getUniqueId()) != null) { - event.setCancelled(true); - } - } + if (PlayerList.getController(player.getUniqueId()) != null) { + event.setCancelled(true); + } + } - @EventHandler - private void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) { - final Player player = event.getPlayer(); + @EventHandler + private void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) { + final Player player = event.getPlayer(); - if (PlayerList.getController(player.getUniqueId()) != null) { - event.setCancelled(true); - } - } + if (PlayerList.getController(player.getUniqueId()) != null) { + event.setCancelled(true); + } + } - @EventHandler - private void onPlayerDropItem(final PlayerDropItemEvent event) { - final Player player = event.getPlayer(); + @EventHandler + private void onPlayerDropItem(final PlayerDropItemEvent event) { + final Player player = event.getPlayer(); - if (PlayerList.getController(player.getUniqueId()) != null) { - event.setCancelled(true); - } - } + if (PlayerList.getController(player.getUniqueId()) != null) { + event.setCancelled(true); + } + } - @EventHandler - private void onPlayerInteract(final PlayerInteractEvent event) { - final Player player = event.getPlayer(); + @EventHandler + private void onPlayerInteract(final PlayerInteractEvent event) { + final Player player = event.getPlayer(); - if (PlayerList.getController(player.getUniqueId()) != null) { - event.setCancelled(true); + if (PlayerList.getController(player.getUniqueId()) != null) { + event.setCancelled(true); - } else if ((event.getAction() == Action.LEFT_CLICK_AIR - || event.getAction() == Action.LEFT_CLICK_BLOCK) - && PlayerList.getTarget(player.getUniqueId()) != null) { - final Player target = PlayerList.getTarget(player.getUniqueId()); + } else if ((event.getAction() == Action.LEFT_CLICK_AIR + || event.getAction() == Action.LEFT_CLICK_BLOCK) + && PlayerList.getTarget(player.getUniqueId()) != null) { + final Player target = PlayerList.getTarget(player.getUniqueId()); - if (event.getHand() == EquipmentSlot.HAND) { - target.swingMainHand(); - } else if (event.getHand() == EquipmentSlot.OFF_HAND) { - target.swingOffHand(); - } - } - } + if (event.getHand() == EquipmentSlot.HAND) { + target.swingMainHand(); + } else if (event.getHand() == EquipmentSlot.OFF_HAND) { + target.swingOffHand(); + } + } + } - @EventHandler - private void onPlayerMove(final PlayerMoveEvent event) { - final Player player = event.getPlayer(); + @EventHandler + private void onPlayerMove(final PlayerMoveEvent event) { + final Player player = event.getPlayer(); - if (PlayerList.getController(player.getUniqueId()) != null) { - event.setCancelled(true); - } - } + if (PlayerList.getController(player.getUniqueId()) != null) { + event.setCancelled(true); + } + } - @EventHandler - private void onPlayerQuit(final PlayerQuitEvent event) { - final Player player = event.getPlayer(); + @EventHandler + private void onPlayerQuit(final PlayerQuitEvent event) { + final Player player = event.getPlayer(); - for (Player otherPlayer: Bukkit.getOnlinePlayers()) { - if (PlayerList.getController(player.getUniqueId()) != null - && PlayerList.getController(player.getUniqueId()).equals(otherPlayer)) { - /* - Target disconnects - */ - PlayerList.removeTarget(otherPlayer.getUniqueId()); - PlayerList.removeController(player.getUniqueId()); + for (Player otherPlayer: Bukkit.getOnlinePlayers()) { + if (PlayerList.getController(player.getUniqueId()) != null + && PlayerList.getController(player.getUniqueId()).equals(otherPlayer)) { + /* + Target disconnects + */ + PlayerList.removeTarget(otherPlayer.getUniqueId()); + PlayerList.removeController(player.getUniqueId()); - final Player controller = otherPlayer; - final int tickDelay = 200; + final Player controller = otherPlayer; + final int tickDelay = 200; - new BukkitRunnable() { - @Override - public void run() { - for (Player allPlayers: Bukkit.getOnlinePlayers()) { - allPlayers.showPlayer(JavaPlugin.getPlugin(Main.class), controller); - } + new BukkitRunnable() { + @Override + public void run() { + for (Player allPlayers: Bukkit.getOnlinePlayers()) { + allPlayers.showPlayer(JavaPlugin.getPlugin(Main.class), controller); + } - final Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); - final Team team = scoreboard.getTeam("icuCollision"); + final Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); + final Team team = scoreboard.getTeam("icuCollision"); - if (team != null - && team.hasEntry(controller.getName())) { - team.removeEntry(controller.getName()); - } + if (team != null + && team.hasEntry(controller.getName())) { + team.removeEntry(controller.getName()); + } - controller.removePotionEffect(PotionEffectType.INVISIBILITY); - controller.sendMessage("You are now visible"); - } - }.runTaskLater(JavaPlugin.getPlugin(Main.class), tickDelay); + controller.removePotionEffect(PotionEffectType.INVISIBILITY); + controller.sendMessage("You are now visible"); + } + }.runTaskLater(JavaPlugin.getPlugin(Main.class), tickDelay); - otherPlayer.sendMessage("The player you were controlling has disconnected. You are invisible for 10 seconds."); + otherPlayer.sendMessage("The player you were controlling has disconnected. You are invisible for 10 seconds."); - } else if (PlayerList.getTarget(player.getUniqueId()) != null - && PlayerList.getTarget(player.getUniqueId()).equals(otherPlayer)) { - /* - Controller disconnects - */ - PlayerList.removeTarget(player.getUniqueId()); - PlayerList.removeController(otherPlayer.getUniqueId()); - } - } - } + } else if (PlayerList.getTarget(player.getUniqueId()) != null + && PlayerList.getTarget(player.getUniqueId()).equals(otherPlayer)) { + /* + Controller disconnects + */ + PlayerList.removeTarget(player.getUniqueId()); + PlayerList.removeController(otherPlayer.getUniqueId()); + } + } + } - @EventHandler - private void onPlayerRespawn(final PlayerRespawnEvent event) { - final Player player = event.getPlayer(); + @EventHandler + private void onPlayerRespawn(final PlayerRespawnEvent event) { + final Player player = event.getPlayer(); - if (PlayerList.getController(player.getUniqueId()) != null) { - final Player controller = PlayerList.getController(player.getUniqueId()); + if (PlayerList.getController(player.getUniqueId()) != null) { + final Player controller = PlayerList.getController(player.getUniqueId()); - controller.teleportAsync(player.getLocation()); - } - } + controller.teleportAsync(player.getLocation()); + } + } } diff --git a/src/main/java/pw/kaboom/icontrolu/Main.java b/src/main/java/pw/kaboom/icontrolu/Main.java index 30d911a..6803eed 100644 --- a/src/main/java/pw/kaboom/icontrolu/Main.java +++ b/src/main/java/pw/kaboom/icontrolu/Main.java @@ -11,42 +11,42 @@ import pw.kaboom.icontrolu.commands.CommandIcu; import pw.kaboom.icontrolu.utilities.PlayerList; public final class Main extends JavaPlugin { - @Override - public void onEnable() { - /* Setup scoreboard team to prevent player collisions */ - final Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); - final Team team = scoreboard.getTeam("icuCollision"); - if (team != null) { - team.unregister(); - } + @Override + public void onEnable() { + /* Setup scoreboard team to prevent player collisions */ + final Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); + final Team team = scoreboard.getTeam("icuCollision"); + if (team != null) { + team.unregister(); + } - /* Commands */ - this.getCommand("icu").setExecutor(new CommandIcu()); + /* Commands */ + this.getCommand("icu").setExecutor(new CommandIcu()); - new Tick().runTaskTimer(this, 0, 1); - this.getServer().getPluginManager().registerEvents(new ControlPlayer(), this); - } + new Tick().runTaskTimer(this, 0, 1); + this.getServer().getPluginManager().registerEvents(new ControlPlayer(), this); + } - @Override - public void onDisable() { - for (Player controller: Bukkit.getOnlinePlayers()) { - final Player target = PlayerList.getTarget(controller.getUniqueId()); + @Override + public void onDisable() { + for (Player controller: Bukkit.getOnlinePlayers()) { + final Player target = PlayerList.getTarget(controller.getUniqueId()); - if (target != null) { - for (Player player: Bukkit.getOnlinePlayers()) { - player.showPlayer(this, controller); - } + if (target != null) { + for (Player player: Bukkit.getOnlinePlayers()) { + player.showPlayer(this, controller); + } - final Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); - final Team team = scoreboard.getTeam("icuCollision"); + final Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); + final Team team = scoreboard.getTeam("icuCollision"); - if (team != null) { - team.unregister(); - } + if (team != null) { + team.unregister(); + } - controller.removePotionEffect(PotionEffectType.INVISIBILITY); - controller.sendMessage("You are no longer controlling \"" + target.getName() + "\" due to server reload"); - } - } - } + controller.removePotionEffect(PotionEffectType.INVISIBILITY); + controller.sendMessage("You are no longer controlling \"" + target.getName() + "\" due to server reload"); + } + } + } } diff --git a/src/main/java/pw/kaboom/icontrolu/commands/CommandIcu.java b/src/main/java/pw/kaboom/icontrolu/commands/CommandIcu.java index d8a9a1d..a17adc5 100644 --- a/src/main/java/pw/kaboom/icontrolu/commands/CommandIcu.java +++ b/src/main/java/pw/kaboom/icontrolu/commands/CommandIcu.java @@ -19,94 +19,94 @@ import pw.kaboom.icontrolu.Main; import pw.kaboom.icontrolu.utilities.PlayerList; public final class CommandIcu implements CommandExecutor { - private void controlCommand(final Player controller, final String label, final String[] args) { - if (args.length == 1) { - controller.sendMessage(ChatColor.RED + "Usage: /" + label + " control "); - } else { - Player target = Bukkit.getPlayer(args[1]); + private void controlCommand(final Player controller, final String label, final String[] args) { + if (args.length == 1) { + controller.sendMessage(ChatColor.RED + "Usage: /" + label + " control "); + } else { + Player target = Bukkit.getPlayer(args[1]); - if (target == null && args[1].matches("([a-f0-9]{8}(-[a-f0-9]{4}){4}[a-f0-9]{8})")) { - target = Bukkit.getPlayer(UUID.fromString(args[1])); - } + if (target == null && args[1].matches("([a-f0-9]{8}(-[a-f0-9]{4}){4}[a-f0-9]{8})")) { + target = Bukkit.getPlayer(UUID.fromString(args[1])); + } - if (target != null) { - if (target == controller) { - controller.sendMessage("You are already controlling yourself"); - } else if (PlayerList.getTarget(controller.getUniqueId()) != null) { - controller.sendMessage("You are already controlling \"" + target.getName() + "\""); - } else if (PlayerList.getController(target.getUniqueId()) != null) { - controller.sendMessage("Player \"" + target.getName() + "\" is already being controlled"); - } else if (PlayerList.getTarget(target.getUniqueId()) != null) { - controller.sendMessage("Player \"" + target.getName() + "\" is already controlling another player"); - } else if (!controller.canSee(target)) { - controller.sendMessage("You may not control this player"); - } else { - controller.teleportAsync(target.getLocation()); + if (target != null) { + if (target == controller) { + controller.sendMessage("You are already controlling yourself"); + } else if (PlayerList.getTarget(controller.getUniqueId()) != null) { + controller.sendMessage("You are already controlling \"" + target.getName() + "\""); + } else if (PlayerList.getController(target.getUniqueId()) != null) { + controller.sendMessage("Player \"" + target.getName() + "\" is already being controlled"); + } else if (PlayerList.getTarget(target.getUniqueId()) != null) { + controller.sendMessage("Player \"" + target.getName() + "\" is already controlling another player"); + } else if (!controller.canSee(target)) { + controller.sendMessage("You may not control this player"); + } else { + controller.teleportAsync(target.getLocation()); - controller.getInventory().setContents(target.getInventory().getContents()); + controller.getInventory().setContents(target.getInventory().getContents()); - PlayerList.setTarget(controller.getUniqueId(), target); - PlayerList.setController(target.getUniqueId(), controller); + PlayerList.setTarget(controller.getUniqueId(), target); + PlayerList.setController(target.getUniqueId(), controller); - controller.sendMessage("You are now controlling \"" + target.getName() + "\""); - } - } else { - controller.sendMessage("Player \"" + args[1] + "\" not found"); - } - } - } + controller.sendMessage("You are now controlling \"" + target.getName() + "\""); + } + } else { + controller.sendMessage("Player \"" + args[1] + "\" not found"); + } + } + } - private void stopCommand(final Player controller) { - final Player target = PlayerList.getTarget(controller.getUniqueId()); + private void stopCommand(final Player controller) { + final Player target = PlayerList.getTarget(controller.getUniqueId()); - if (target != null) { - PlayerList.removeTarget(controller.getUniqueId()); - PlayerList.removeController(target.getUniqueId()); + if (target != null) { + PlayerList.removeTarget(controller.getUniqueId()); + PlayerList.removeController(target.getUniqueId()); - final int tickDelay = 200; + final int tickDelay = 200; - new BukkitRunnable() { - @Override - public void run() { - for (Player player: Bukkit.getOnlinePlayers()) { - player.showPlayer(JavaPlugin.getPlugin(Main.class), controller); - } + new BukkitRunnable() { + @Override + public void run() { + for (Player player: Bukkit.getOnlinePlayers()) { + player.showPlayer(JavaPlugin.getPlugin(Main.class), controller); + } - Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); - Team team = scoreboard.getTeam("icuCollision"); - if (team != null && team.hasEntry(controller.getName())) { - team.removeEntry(controller.getName()); - } + Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard(); + Team team = scoreboard.getTeam("icuCollision"); + if (team != null && team.hasEntry(controller.getName())) { + team.removeEntry(controller.getName()); + } - controller.removePotionEffect(PotionEffectType.INVISIBILITY); - controller.sendMessage("You are now visible"); - } - }.runTaskLater(JavaPlugin.getPlugin(Main.class), tickDelay); + controller.removePotionEffect(PotionEffectType.INVISIBILITY); + controller.sendMessage("You are now visible"); + } + }.runTaskLater(JavaPlugin.getPlugin(Main.class), tickDelay); - final int seconds = tickDelay / 20; + final int seconds = tickDelay / 20; - controller.sendMessage("You are no longer controlling \"" + target.getName() + "\". You are invisible for " + seconds + " seconds."); - } else { - controller.sendMessage("You are not controlling anyone at the moment"); - } - } + controller.sendMessage("You are no longer controlling \"" + target.getName() + "\". You are invisible for " + seconds + " seconds."); + } else { + controller.sendMessage("You are not controlling anyone at the moment"); + } + } - @Override - public boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args) { - if (sender instanceof ConsoleCommandSender) { - sender.sendMessage("Command has to be run by a player"); - return true; - } + @Override + public boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args) { + if (sender instanceof ConsoleCommandSender) { + sender.sendMessage("Command has to be run by a player"); + return true; + } - final Player controller = (Player) sender; + final Player controller = (Player) sender; - if (args.length == 0) { - controller.sendMessage(ChatColor.RED + "Usage: /" + label + " "); - } else if (args[0].equalsIgnoreCase("control")) { - controlCommand(controller, label, args); - } else if (args[0].equalsIgnoreCase("stop")) { - stopCommand(controller); - } - return true; - } + if (args.length == 0) { + controller.sendMessage(ChatColor.RED + "Usage: /" + label + " "); + } else if (args[0].equalsIgnoreCase("control")) { + controlCommand(controller, label, args); + } else if (args[0].equalsIgnoreCase("stop")) { + stopCommand(controller); + } + return true; + } } diff --git a/src/main/java/pw/kaboom/icontrolu/utilities/PlayerList.java b/src/main/java/pw/kaboom/icontrolu/utilities/PlayerList.java index c5302b9..c7c38ab 100644 --- a/src/main/java/pw/kaboom/icontrolu/utilities/PlayerList.java +++ b/src/main/java/pw/kaboom/icontrolu/utilities/PlayerList.java @@ -6,33 +6,33 @@ import java.util.UUID; import org.bukkit.entity.Player; public final class PlayerList { - private PlayerList() { - } + private PlayerList() { + } - private static HashMap controllerFor = new HashMap(); - private static HashMap targetFor = new HashMap(); + private static HashMap controllerFor = new HashMap(); + private static HashMap targetFor = new HashMap(); - public static Player getController(final UUID playerUuid) { - return controllerFor.get(playerUuid); - } + public static Player getController(final UUID playerUuid) { + return controllerFor.get(playerUuid); + } - public static Player getTarget(final UUID playerUuid) { - return targetFor.get(playerUuid); - } + public static Player getTarget(final UUID playerUuid) { + return targetFor.get(playerUuid); + } - public static void removeController(final UUID playerUuid) { - controllerFor.remove(playerUuid); - } + public static void removeController(final UUID playerUuid) { + controllerFor.remove(playerUuid); + } - public static void removeTarget(final UUID playerUuid) { - targetFor.remove(playerUuid); - } + public static void removeTarget(final UUID playerUuid) { + targetFor.remove(playerUuid); + } - public static void setController(final UUID playerUuid, final Player player) { - controllerFor.put(playerUuid, player); - } + public static void setController(final UUID playerUuid, final Player player) { + controllerFor.put(playerUuid, player); + } - public static void setTarget(final UUID playerUuid, final Player player) { - targetFor.put(playerUuid, player); - } + public static void setTarget(final UUID playerUuid, final Player player) { + targetFor.put(playerUuid, player); + } } diff --git a/suppressions.xml b/suppressions.xml index 790ec65..78fba39 100644 --- a/suppressions.xml +++ b/suppressions.xml @@ -1,11 +1,10 @@ + "-//Puppy Crawl//DTD Suppressions 1.0//EN" + "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd"> - - - + +