diff options
Diffstat (limited to 'src/main/java/cat/freya/khs/game')
5 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/cat/freya/khs/game/Board.java b/src/main/java/cat/freya/khs/game/Board.java index e8e378d..1471fee 100644 --- a/src/main/java/cat/freya/khs/game/Board.java +++ b/src/main/java/cat/freya/khs/game/Board.java @@ -36,7 +36,7 @@ public class Board { public boolean containsUUID(UUID uuid) { return Players.containsKey(uuid); - } + } public boolean isHider(Player player) { return isHider(player.getUniqueId()); diff --git a/src/main/java/cat/freya/khs/game/Game.java b/src/main/java/cat/freya/khs/game/Game.java index 69e9b82..9e15689 100644 --- a/src/main/java/cat/freya/khs/game/Game.java +++ b/src/main/java/cat/freya/khs/game/Game.java @@ -347,7 +347,7 @@ public class Game { public void broadcastTitle(String title, String subtitle) { for (Player player : board.getPlayers()) { - Titles.sendTitle(player, 10, 70, 20, title, subtitle); + Titles.sendTitle(player, 10, 70, 20, title, subtitle); } } diff --git a/src/main/java/cat/freya/khs/game/listener/DisguiseHandler.java b/src/main/java/cat/freya/khs/game/listener/DisguiseHandler.java index d874ae9..7bfca5f 100644 --- a/src/main/java/cat/freya/khs/game/listener/DisguiseHandler.java +++ b/src/main/java/cat/freya/khs/game/listener/DisguiseHandler.java @@ -62,7 +62,7 @@ public class DisguiseHandler implements Listener { Disguise disguise = Main.getInstance().getDisguiser().getByEntityID(id); if(disguise == null) disguise = Main.getInstance().getDisguiser().getByHitBoxID(id); if(disguise == null) return; - + if(disguise.getPlayer().getGameMode() == GameMode.CREATIVE) return; event.setCancelled(true); handleAttack(disguise, player); diff --git a/src/main/java/cat/freya/khs/game/listener/InteractHandler.java b/src/main/java/cat/freya/khs/game/listener/InteractHandler.java index 09ab62b..5203285 100644 --- a/src/main/java/cat/freya/khs/game/listener/InteractHandler.java +++ b/src/main/java/cat/freya/khs/game/listener/InteractHandler.java @@ -108,11 +108,11 @@ public class InteractHandler implements Listener { } public static void createSpectatorTeleportPage(Player player, int page) { - + if (page < 0) { return; } - + final Board board = Main.getInstance().getBoard(); List<Player> players = new ArrayList<>(); players.addAll(board.getHiders()); @@ -121,13 +121,13 @@ public class InteractHandler implements Listener { final int page_size = 9 * 5; final int amount = players.size(); final int start = page * page_size; - + int page_amount = amount - start; - + if (page_amount < 1) { return; } - + boolean next = false, prev = true; if (page_amount > page_size) { @@ -145,12 +145,12 @@ public class InteractHandler implements Listener { final List<String> hider_lore = new ArrayList<>(); hider_lore.add(message("HIDER_TEAM_NAME").toString()); final List<String> seeker_lore = new ArrayList<>(); seeker_lore.add(message("SEEKER_TEAM_NAME").toString()); - + for (int i = 0; i < page_amount; i++) { Player plr = players.get(i); teleportMenu.addItem(getSkull(plr, board.isHider(plr) ? hider_lore : seeker_lore)); } - + final int lastRow = (rows - 1) * 9; if (prev) { teleportMenu.setItem(lastRow, getPageItem(page - 1)); diff --git a/src/main/java/cat/freya/khs/game/listener/InventoryHandler.java b/src/main/java/cat/freya/khs/game/listener/InventoryHandler.java index ccf292d..1ffa996 100644 --- a/src/main/java/cat/freya/khs/game/listener/InventoryHandler.java +++ b/src/main/java/cat/freya/khs/game/listener/InventoryHandler.java @@ -55,12 +55,12 @@ public class InventoryHandler implements Listener { private void checkForSpectatorTeleportMenu(InventoryClickEvent event){ Player player = (Player) event.getWhoClicked(); - + ItemStack item = event.getCurrentItem(); ItemMeta meta = item.getItemMeta(); String name = meta.getDisplayName(); - + if (Main.getInstance().getBoard().isSpectator(player)) { if (XMaterial.PLAYER_HEAD.isSimilar(item)) { event.setCancelled(true); |