From a353e29246f2d86ccd771734791f525420c1cf34 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Sat, 30 Jul 2022 18:49:18 -0400 Subject: refactoring and blockhunt disguise bug fixes --- .../net/tylermurphy/hideAndSeek/command/Debug.java | 12 ++------ .../tylermurphy/hideAndSeek/command/SetBorder.java | 5 ++-- .../tylermurphy/hideAndSeek/command/SetBounds.java | 33 +++++++++++----------- .../net/tylermurphy/hideAndSeek/command/Top.java | 2 -- 4 files changed, 21 insertions(+), 31 deletions(-) (limited to 'src/main/java/net/tylermurphy/hideAndSeek/command') diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Debug.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Debug.java index 7ddc72c..61d0c46 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Debug.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Debug.java @@ -73,16 +73,10 @@ public class Debug implements ICommand { } player.teleport(new Location(Bukkit.getWorld(Main.getInstance().getGame().getGameWorld()), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ())); })); - debugMenu.setItem(7, createOption(7, Material.ENDER_PEARL, "&d&lTeleport: &fLobby", 2, player -> { - player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(), lobbyPosition.getY(), lobbyPosition.getZ())); - })); - debugMenu.setItem(8, createOption(8, Material.ENDER_PEARL, "&d&lTeleport: &fExit", 3, player -> { - player.teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ())); - })); + debugMenu.setItem(7, createOption(7, Material.ENDER_PEARL, "&d&lTeleport: &fLobby", 2, player -> player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(), lobbyPosition.getY(), lobbyPosition.getZ())))); + debugMenu.setItem(8, createOption(8, Material.ENDER_PEARL, "&d&lTeleport: &fExit", 3, player -> player.teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ())))); debugMenu.setItem(9, createOption(9, XMaterial.GLASS.parseMaterial(), "&dEnable Disguise", 1, PlayerLoader::openBlockHuntPicker)); - debugMenu.setItem(10, createOption(10, XMaterial.PLAYER_HEAD.parseMaterial(), "&dDisable Disguise", 1, player -> { - Main.getInstance().getDisguiser().reveal(player); - })); + debugMenu.setItem(10, createOption(10, XMaterial.PLAYER_HEAD.parseMaterial(), "&dDisable Disguise", 1, player -> Main.getInstance().getDisguiser().reveal(player))); } private ItemStack createOption(int slow, Material material, String name, int amount, Consumer callback){ diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java index 45e66b9..b456e6a 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java @@ -68,10 +68,9 @@ public class SetBorder implements ICommand { return; } Vector vec = new Vector(); - Player player = (Player) sender; - vec.setX(player.getLocation().getBlockX()); + vec.setX(sender.getLocation().getBlockX()); vec.setY(0); - vec.setZ(player.getLocation().getBlockZ()); + vec.setZ(sender.getLocation().getBlockZ()); if (spawnPosition.distance(vec) > 100) { sender.sendMessage(errorPrefix + message("WORLDBORDER_POSITION")); return; diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java index 90ecb28..434e4a6 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java @@ -37,12 +37,11 @@ public class SetBounds implements ICommand { sender.sendMessage(errorPrefix + message("ERROR_GAME_SPAWN")); return; } - Player player = (Player) sender; - if (!player.getWorld().getName().equals(spawnWorld)) { + if (!sender.getWorld().getName().equals(spawnWorld)) { sender.sendMessage(errorPrefix + message("BOUNDS_WRONG_WORLD")); return; } - if (player.getLocation().getBlockX() == 0 || player.getLocation().getBlockZ() == 0) { + if (sender.getLocation().getBlockX() == 0 || sender.getLocation().getBlockZ() == 0) { sender.sendMessage(errorPrefix + message("NOT_AT_ZERO")); return; } @@ -51,32 +50,32 @@ public class SetBounds implements ICommand { saveMinX = 0; saveMinZ= 0; saveMaxX = 0; saveMaxZ = 0; } if (saveMaxX == 0) { - addToConfig("bounds.max.x", player.getLocation().getBlockX()); - saveMaxX = player.getLocation().getBlockX(); - } else if (saveMaxX < player.getLocation().getBlockX()) { + addToConfig("bounds.max.x", sender.getLocation().getBlockX()); + saveMaxX = sender.getLocation().getBlockX(); + } else if (saveMaxX < sender.getLocation().getBlockX()) { first = false; - addToConfig("bounds.max.x", player.getLocation().getBlockX()); + addToConfig("bounds.max.x", sender.getLocation().getBlockX()); addToConfig("bounds.min.x", saveMaxX); saveMinX = saveMaxX; - saveMaxX = player.getLocation().getBlockX(); + saveMaxX = sender.getLocation().getBlockX(); } else { first = false; - addToConfig("bounds.min.x", player.getLocation().getBlockX()); - saveMinX = player.getLocation().getBlockX(); + addToConfig("bounds.min.x", sender.getLocation().getBlockX()); + saveMinX = sender.getLocation().getBlockX(); } if (saveMaxZ == 0) { - addToConfig("bounds.max.z", player.getLocation().getBlockZ()); - saveMaxZ = player.getLocation().getBlockZ(); - } else if (saveMaxZ < player.getLocation().getBlockZ()) { + addToConfig("bounds.max.z", sender.getLocation().getBlockZ()); + saveMaxZ = sender.getLocation().getBlockZ(); + } else if (saveMaxZ < sender.getLocation().getBlockZ()) { first = false; - addToConfig("bounds.max.z", player.getLocation().getBlockZ()); + addToConfig("bounds.max.z", sender.getLocation().getBlockZ()); addToConfig("bounds.min.z", saveMaxZ); saveMinZ = saveMaxZ; - saveMaxZ = player.getLocation().getBlockZ(); + saveMaxZ = sender.getLocation().getBlockZ(); } else { first = false; - addToConfig("bounds.min.z", player.getLocation().getBlockZ()); - saveMinZ = player.getLocation().getBlockZ(); + addToConfig("bounds.min.z", sender.getLocation().getBlockZ()); + saveMinZ = sender.getLocation().getBlockZ(); } sender.sendMessage(messagePrefix + message("BOUNDS").addAmount(first ? 1 : 2)); saveConfig(); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java index 6125a00..72a695c 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Top.java @@ -21,9 +21,7 @@ package net.tylermurphy.hideAndSeek.command; import net.tylermurphy.hideAndSeek.Main; import net.tylermurphy.hideAndSeek.database.util.PlayerInfo; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; -import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; import java.util.List; -- cgit v1.2.3-freya