The player to assign as a seeker
*/ private void addSeeker(Arena arena, Player player) { - ArenaHandler.sendMessage(arena, MessageKey.NORMAL_IN_GAME_SEEKER_CHOSEN, "seeker-" + player.getName()); + ArenaHelper.sendMessage(arena, MessageKey.NORMAL_IN_GAME_SEEKER_CHOSEN, "seeker-" + player.getName()); arena.seekers.add(player); - PlayerHandler.teleport(player, arena.arenaLocations.getSeekersWarp()); + PlayerHelper.teleport(player, arena.arenaLocations.getSeekersWarp()); player.getInventory().clear(); player.setWalkSpeed(0.3F); MemoryStorage.seekerTime.put(player, arena.waitingTimeSeeker); @@ -373,7 +376,7 @@ public class BlockHunt extends JavaPlugin implements Listener { // If the game ends, trigger the hiders' win if (arena.timer <= 0) { - ArenaHandler.hidersWin(arena); + ArenaHelper.hidersWin(arena); return; } @@ -397,12 +400,12 @@ public class BlockHunt extends JavaPlugin implements Listener { remainingBlocks.add(uppercaseAllFirst(block.replace("_", " "))); } String blocklist = String.join(", ", remainingBlocks); - ArenaHandler.sendMessage(arena, MessageKey.NORMAL_IN_GAME_BLOCKS_LEFT, "1-" + blocklist); + ArenaHelper.sendMessage(arena, MessageKey.NORMAL_IN_GAME_BLOCKS_LEFT, "1-" + blocklist); } // Count down towards the end of the arena if (arena.timer == 190 || arena.timer == 60 || arena.timer == 30 || arena.timer == 10 || arena.timer <= 5) { - ArenaHandler.sendMessage(arena, MessageKey.NORMAL_IN_GAME_ARENA_END, "1-" + arena.timer); + ArenaHelper.sendMessage(arena, MessageKey.NORMAL_IN_GAME_ARENA_END, "1-" + arena.timer); } // Play a sound for the last 5 seconds of the arena game's duration if (arena.timer <= 5) { @@ -417,7 +420,7 @@ public class BlockHunt extends JavaPlugin implements Listener { for (Player player : arena.hiders) { updateHiddenState(player); } - ScoreboardHandler.updateScoreboard(arena); // TODO Only do this when needed (player added/removed) + ScoreboardHelper.updateScoreboard(arena); // TODO Only do this when needed (player added/removed) } /** @@ -447,74 +450,15 @@ public class BlockHunt extends JavaPlugin implements Listener { // Just decrease the timer inventoryBlock.setAmount(inventoryBlock.getAmount() - 1); } else { - // Try to make the player solid - Block playerBlock = player.getLocation().getBlock(); - BlockData playerBlockData = playerBlock.getBlockData(); - if (playerBlockData.getMaterial().isAir() || playerBlockData.getMaterial().equals(Material.WATER)) { - makePlayerSolid(player, playerBlock, playerBlockData, inventoryBlock, playerLocation); - } else { - MessageHelper.sendMessage(player, MessageKey.WARNING_IN_GAME_NO_SOLID_PLACE); - } + VisibilityHelper.makePlayerSolid(player, inventoryBlock); } } else { // The player moved. Un-hide and reset the hide timer inventoryBlock.setAmount(5); if (!DisguiseAPI.isDisguised(player)) { - SolidBlockHandler.makePlayerUnsolid(player); + VisibilityHelper.makePlayerUnSolid(player); } } } - /** - * Makes a player into a perceived solid block - * - * @param playerThe player to make solid
- * @param playerBlockThe block the player is currently standing at
- * @param playerBlockDataThe data of the block the player is currently standing at
- * @param inventoryBlockThe inventory block which corresponds to the player's hide material
- * @param playerLocationThe current location of the player
- */ - private void makePlayerSolid(Player player, Block playerBlock, BlockData playerBlockData, ItemStack inventoryBlock, - Location playerLocation) { - // Store whether the player is replacing water so the water can be restored afterwards - if (playerBlockData.getMaterial().equals(Material.WATER)) { - MemoryStorage.hiddenLocationWater.put(player, true); - } else { - MemoryStorage.hiddenLocationWater.put(player, false); - } - - if (DisguiseAPI.isDisguised(player)) { - // Hide the player, and make all other players see a full block in the player's location - DisguiseAPI.undisguiseToAll(player); - for (Player onlinePlayer : Bukkit.getOnlinePlayers()) { - if (!onlinePlayer.equals(player)) { - onlinePlayer.hidePlayer(this, player); - onlinePlayer.sendBlockChange(playerBlock.getLocation(), - inventoryBlock.getType().createBlockData()); - } - } - - inventoryBlock.addUnsafeEnchantment(Enchantment.DURABILITY, 10); - player.playSound(playerLocation, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); - // Store the location the player is hidden at - MemoryStorage.hiddenLocation.put(player, playerLocation); - - // Announce to the player that they are now hidden - String blockName = inventoryBlock.getType().name(); - blockName = uppercaseAllFirst(blockName.replace("_", " ")); - MessageHelper.sendMessage(player, MessageKey.NORMAL_IN_GAME_NOW_SOLID, "block-" - + blockName); - } - - for (Player otherPlayer : Bukkit.getOnlinePlayers()) { - if (otherPlayer.equals(player)) { - continue; - } - - // Hide the player and update the perceived - otherPlayer.hidePlayer(this, player); - otherPlayer.sendBlockChange(playerBlock.getLocation(), inventoryBlock.getType().createBlockData()); - } - } - } diff --git a/src/main/java/net/knarcraft/blockhunt/MemoryStorage.java b/src/main/java/net/knarcraft/blockhunt/MemoryStorage.java index 5fa815e..74a4e50 100644 --- a/src/main/java/net/knarcraft/blockhunt/MemoryStorage.java +++ b/src/main/java/net/knarcraft/blockhunt/MemoryStorage.java @@ -4,6 +4,7 @@ import net.knarcraft.blockhunt.arena.Arena; import net.knarcraft.blockhunt.manager.Command; import net.knarcraft.blockhunt.manager.ConfigManager; import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -51,8 +52,9 @@ public class MemoryStorage { public static final MapThe location the player was at before joining the arena
+ * @param playerGameModeThe game mode the player was in
+ * @param playerInventoryThe player's earlier inventory
+ * @param playerArmorThe player's earlier equipped armor
+ * @param playerEXPThe player's earlier exp amount
+ * @param playerEXPLevelsThe player's earlier exp level
+ * @param playerMaxHealthThe player's previous max health
+ * @param playerHealthThe player's previous health
+ * @param playerFoodThe player's previous food amount
+ * @param playerPotionEffectsThe player's previous potion effects
+ * @param playerFlyingThe player's previous flying state
+ */ public record PlayerArenaData(Location playerLocation, GameMode playerGameMode, ItemStack[] playerInventory, ItemStack[] playerArmor, Float playerEXP, Integer playerEXPLevels, Double playerMaxHealth, Double playerHealth, Integer playerFood, CollectionThe arena to announce to
- * @param messageThe message to display
- * @param variablesThe variables to replace in the message
- */ - public static void sendMessage(Arena arena, String message, String... variables) { - MessageHelper.broadcastMessage(arena.playersInArena, message, variables); - } - - /** - * Sends a message to all players in an arena - * - * @param arenaThe arena to announce to
- * @param messageKeyThe message key defining the string to display
- * @param variablesThe variables to replace in the message
- */ - public static void sendMessage(Arena arena, MessageKey messageKey, String... variables) { - MessageHelper.broadcastMessage(arena.playersInArena, messageKey, variables); - } - - public static void playerJoinArena(Player player, String arenaName) { - boolean alreadyJoined = false; - for (Arena arena : MemoryStorage.arenaMap.values()) { - if (arena.playersInArena != null && arena.playersInArena.contains(player)) { - alreadyJoined = true; - break; - } - } - - if (alreadyJoined) { - MessageHelper.sendMessage(player, MessageKey.ERROR_JOIN_ALREADY_JOINED); - return; - } - - Arena arena = MemoryStorage.arenaMap.get(arenaName.toLowerCase()); - if (arena != null) { - if (arena.disguiseBlocks.isEmpty()) { - MessageHelper.sendMessage(player, MessageKey.ERROR_JOIN_NO_BLOCKS_SET); - } else { - boolean inventoryEmpty = true; - for (ItemStack inventoryItem : player.getInventory()) { - if (inventoryItem != null && inventoryItem.getType() != Material.AIR) { - inventoryEmpty = false; - } - } - - for (ItemStack inventoryItem : player.getInventory().getArmorContents()) { - if (inventoryItem != null && inventoryItem.getType() != Material.AIR) { - inventoryEmpty = false; - } - } - - if ((Boolean) MemoryStorage.config.get(ConfigKey.REQUIRE_INVENTORY_CLEAR_ON_JOIN) && !inventoryEmpty) { - MessageHelper.sendMessage(player, MessageKey.ERROR_JOIN_INVENTORY_NOT_EMPTY); - return; - } - - Location zero = new Location(Bukkit.getWorld(player.getWorld().getName()), 0, 0, 0, 0, 0); - ArenaLocations locations = arena.arenaLocations; - if (locations.getLobbyWarp() != null && locations.getHidersWarp() != null && - locations.getSeekersWarp() != null && locations.getExitWarp() != null) { - if (!locations.getLobbyWarp().equals(zero) && !locations.getHidersWarp().equals(zero) && - !locations.getSeekersWarp().equals(zero) && !locations.getExitWarp().equals(zero)) { - if (arena.gameState == ArenaState.WAITING || arena.gameState == ArenaState.STARTING) { - if (arena.playersInArena.size() >= arena.maxPlayers && - !PermissionsManager.hasPermission(player, Permission.JOIN_FULL, false)) { - MessageHelper.sendMessage(player, MessageKey.ERROR_JOIN_FULL); - return; - } - - boolean canWarp = PlayerHandler.teleport(player, locations.getLobbyWarp()); - if (!canWarp) { - MessageHelper.sendMessage(player, MessageKey.ERROR_TELEPORT_FAILED); - return; - } - - BlockHunt.plugin.getLogger().log(Level.INFO, player.getName() + " has joined " + arenaName); - arena.playersInArena.add(player); - JoinArenaEvent event = new JoinArenaEvent(player, arena); - Bukkit.getPluginManager().callEvent(event); - - PlayerArenaData pad = new PlayerArenaData(player.getLocation(), player.getGameMode(), player.getInventory().getContents(), player - .getInventory().getArmorContents(), player.getExp(), player.getLevel(), player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(), player.getHealth(), player.getFoodLevel(), - player.getActivePotionEffects(), player.getAllowFlight()); - - MemoryStorage.playerData.put(player, pad); - - player.setGameMode(GameMode.SURVIVAL); - for (PotionEffect pe : player.getActivePotionEffects()) { - player.removePotionEffect(pe.getType()); - } - player.setFoodLevel(20); - player.setHealth(20); - player.getAttribute(Attribute.GENERIC_MAX_HEALTH).setBaseValue(20); - player.setLevel(arena.timer); - player.setExp(0); - player.getInventory().clear(); - player.getInventory().setHelmet(new ItemStack(Material.AIR)); - player.getInventory().setChestplate(new ItemStack(Material.AIR)); - player.getInventory().setLeggings(new ItemStack(Material.AIR)); - player.getInventory().setBoots(new ItemStack(Material.AIR)); - player.setFlying(false); - player.setAllowFlight(false); - player.setWalkSpeed(0.2F); - - // Fix for client not showing players after - // they join - for (Player otherPlayer : arena.playersInArena) { - if (otherPlayer.canSee(player)) { - otherPlayer.showPlayer(BlockHunt.plugin, player); // Make - } - // new - // player - // visible - // to - // others - if (player.canSee(otherPlayer)) { - player.showPlayer(BlockHunt.plugin, otherPlayer); // Make - } - // other - // players - // visible - // to - // new - // player - } - - if ((Boolean) MemoryStorage.config.get(ConfigKey.SHOP_BLOCK_CHOOSER_V_1_ENABLED)) { - if (MemoryStorage.shop.getFileConfiguration().get(player.getName() + ".blockchooser") != null - || PermissionsManager.hasPermission(player, Permission.SHOP_BLOCK_CHOOSER, false)) { - ItemStack shopBlockChooser = new ItemStack(Material.getMaterial((String) MemoryStorage.config.get(ConfigKey.SHOP_BLOCK_CHOOSER_V_1_ID_NAME)), 1); - ItemMeta shopBlockChooser_IM = shopBlockChooser.getItemMeta(); - shopBlockChooser_IM.setDisplayName(MessageHelper.replaceAll((String) MemoryStorage.config.get(ConfigKey.SHOP_BLOCK_CHOOSER_V_1_NAME))); - ListThe player that's changing tokens
+ * @param tokenPlayerThe player whose tokens are changed
+ * @param nameThe name of the player that's changing tokens
+ * @param newTokensThe amount of tokens to set for the player
+ * @param actionA description of the action performed
+ * @param pronounThe pronoun to use for the action. Ex: if the action is "Added", the correct pronoun is "to"
+ */ + private void updateTokens(Player player, Player tokenPlayer, String name, int newTokens, String action, + String pronoun) { + TokensHelper.setTokens(player, newTokens); + MessageHelper.sendMessage(player, MessageKey.NORMAL_TOKENS_CHANGED, "option-" + action, + "%playerName%-" + tokenPlayer.getName(), "option2-" + pronoun, "amount-" + newTokens); + MessageHelper.sendMessage(tokenPlayer, MessageKey.NORMAL_TOKENS_CHANGED_PERSON, "option-" + + action.toLowerCase(), "%playerName%-" + name, "option2-" + pronoun, "amount-" + newTokens); + } + } diff --git a/src/main/java/net/knarcraft/blockhunt/config/MessageKey.java b/src/main/java/net/knarcraft/blockhunt/config/MessageKey.java index 2b77437..b712399 100644 --- a/src/main/java/net/knarcraft/blockhunt/config/MessageKey.java +++ b/src/main/java/net/knarcraft/blockhunt/config/MessageKey.java @@ -65,7 +65,7 @@ public enum MessageKey implements Key { NORMAL_IN_GAME_HIDERS_LEFT("%NHider(s) left: %A%left%%N", "normal.inGameHidersLeft"), NORMAL_IN_GAME_SEEKER_DIED("%TAG%NSeeker %A%%playerName%%%N died and will respawn in %A%seconds%%N" + "seconds!", "normal.inGameSeekerDied"), - normal_winSeekers("%TAG%NThe %ASEEKERS%N have won!", "normal.winSeekers"), + NORMAL_WIN_SEEKERS("%TAG%NThe %ASEEKERS%N have won!", "normal.winSeekers"), NORMAL_WIN_HIDERS("%TAG%NThe %AHIDERS%N have won!", "normal.winHiders"), NORMAL_SET_WARP_WARP_SET("%TAG%NSet warp '%A%warp%%N' to your location!", "normal.setWarpWarpSet"), NORMAL_ADDED_TOKEN("%TAG%A%amount%%N tokens were added to your account!", "normal.addedToken"), diff --git a/src/main/java/net/knarcraft/blockhunt/listener/OnBlockBreakEvent.java b/src/main/java/net/knarcraft/blockhunt/listener/OnBlockBreakEvent.java index 39484c8..f24e65c 100644 --- a/src/main/java/net/knarcraft/blockhunt/listener/OnBlockBreakEvent.java +++ b/src/main/java/net/knarcraft/blockhunt/listener/OnBlockBreakEvent.java @@ -1,9 +1,6 @@ package net.knarcraft.blockhunt.listener; import net.knarcraft.blockhunt.MemoryStorage; -import net.knarcraft.blockhunt.arena.Arena; -import net.knarcraft.blockhunt.arena.ArenaHandler; -import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -13,16 +10,8 @@ public class OnBlockBreakEvent implements Listener { @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlockBreakEvent(BlockBreakEvent event) { - // Early exit if no one is in any arena - if (ArenaHandler.noPlayersInArenas()) { - return; - } - - Player player = event.getPlayer(); - for (Arena arena : MemoryStorage.arenaMap.values()) { - if (arena.playersInArena.contains(player)) { - event.setCancelled(true); - } + if (MemoryStorage.playerArena.get(event.getPlayer()) != null) { + event.setCancelled(true); } } } diff --git a/src/main/java/net/knarcraft/blockhunt/listener/OnBlockPlaceEvent.java b/src/main/java/net/knarcraft/blockhunt/listener/OnBlockPlaceEvent.java index fec9a48..2a3595d 100644 --- a/src/main/java/net/knarcraft/blockhunt/listener/OnBlockPlaceEvent.java +++ b/src/main/java/net/knarcraft/blockhunt/listener/OnBlockPlaceEvent.java @@ -1,9 +1,6 @@ package net.knarcraft.blockhunt.listener; import net.knarcraft.blockhunt.MemoryStorage; -import net.knarcraft.blockhunt.arena.Arena; -import net.knarcraft.blockhunt.arena.ArenaHandler; -import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -13,16 +10,8 @@ public class OnBlockPlaceEvent implements Listener { @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlockPlaceEvent(BlockPlaceEvent event) { - // Early exit if no one is in any arena - if (ArenaHandler.noPlayersInArenas()) { - return; - } - - Player player = event.getPlayer(); - for (Arena arena : MemoryStorage.arenaMap.values()) { - if (arena.playersInArena.contains(player)) { - event.setCancelled(true); - } + if (MemoryStorage.playerArena.get(event.getPlayer()) != null) { + event.setCancelled(true); } } } diff --git a/src/main/java/net/knarcraft/blockhunt/listener/OnEntityDamageByEntityEvent.java b/src/main/java/net/knarcraft/blockhunt/listener/OnEntityDamageByEntityEvent.java index 8f12ee2..a0f4538 100644 --- a/src/main/java/net/knarcraft/blockhunt/listener/OnEntityDamageByEntityEvent.java +++ b/src/main/java/net/knarcraft/blockhunt/listener/OnEntityDamageByEntityEvent.java @@ -3,13 +3,15 @@ package net.knarcraft.blockhunt.listener; import me.libraryaddict.disguise.DisguiseAPI; import net.knarcraft.blockhunt.BlockHunt; import net.knarcraft.blockhunt.MemoryStorage; -import net.knarcraft.blockhunt.PlayerHandler; import net.knarcraft.blockhunt.arena.Arena; -import net.knarcraft.blockhunt.arena.ArenaHandler; import net.knarcraft.blockhunt.arena.ArenaState; import net.knarcraft.blockhunt.config.MessageKey; +import net.knarcraft.blockhunt.util.ArenaHelper; import net.knarcraft.blockhunt.util.MessageHelper; +import net.knarcraft.blockhunt.util.PlayerHelper; import net.knarcraft.blockhunt.util.StringHelper; +import net.knarcraft.blockhunt.util.TokensHelper; +import net.knarcraft.blockhunt.util.VisibilityHelper; import org.bukkit.GameMode; import org.bukkit.Sound; import org.bukkit.entity.Arrow; @@ -35,7 +37,7 @@ public class OnEntityDamageByEntityEvent implements Listener { } // Early exit if no one is in any arena - if (ArenaHandler.noPlayersInArenas()) { + if (ArenaHelper.noPlayersInArenas()) { return; } @@ -58,120 +60,130 @@ public class OnEntityDamageByEntityEvent implements Listener { return; } - for (Arena arena : MemoryStorage.arenaMap.values()) { - if (arena.playersInArena.contains(player)) { - if (arena.gameState == ArenaState.WAITING || arena.gameState == ArenaState.STARTING) { - // Always cancel damage when players are waiting + Arena arena = MemoryStorage.playerArena.get(player); + if (arena == null) { + return; + } + + if (arena.gameState == ArenaState.WAITING || arena.gameState == ArenaState.STARTING) { + // Always cancel damage when players are waiting + event.setCancelled(true); + return; + } + + // Seeker receiving damage + if (arena.seekers.contains(player)) { + if (arena.seekers.contains(damageDealer)) { + // Seeker damaged by seeker + if (!arena.seekersCanHurtSeekers) { + event.setCancelled(true); + return; + } + } else { + // Seeker damaged by hider + if (!arena.hidersCanHurtSeekers) { event.setCancelled(true); return; - } else { - // Seeker receiving damage - if (arena.seekers.contains(player)) { - if (arena.seekers.contains(damageDealer)) { - // Seeker damaged by seeker - if (!arena.seekersCanHurtSeekers) { - event.setCancelled(true); - return; - } - } else { - // Seeker damaged by hider - if (!arena.hidersCanHurtSeekers) { - event.setCancelled(true); - return; - } - } - } else { - // Hider damaged by hider - if (!arena.hidersCanHurtHiders && !arena.seekers.contains(damageDealer)) { - event.setCancelled(true); - return; - } - } - - // The damage is allowed, so lets handle it! - player.getWorld().playSound(player.getLocation(), Sound.ENTITY_PLAYER_HURT, 1, 1); - - if (event.getDamage() >= player.getHealth()) { - player.setHealth(20); - event.setCancelled(true); - - // try moving everything to the next tick to prevent "Removing entity while ticking" errors - Player finalDamager = damageDealer; - player.getServer().getScheduler().runTask(BlockHunt.plugin, () -> { - DisguiseAPI.undisguiseToAll(player); - MemoryStorage.playerBlock.remove(player); - - if (!arena.seekers.contains(player)) { - if (MemoryStorage.shop.getFileConfiguration().get(finalDamager.getName() + ".tokens") == null) { - MemoryStorage.shop.getFileConfiguration().set(finalDamager.getName() + ".tokens", 0); - MemoryStorage.shop.save(); - } - int damagerTokens = MemoryStorage.shop.getFileConfiguration().getInt(finalDamager.getName() + ".tokens"); - MemoryStorage.shop.getFileConfiguration().set(finalDamager.getName() + ".tokens", damagerTokens + arena.killTokens); - MemoryStorage.shop.save(); - - MessageHelper.sendMessage(finalDamager, MessageKey.NORMAL_ADDED_TOKEN, "amount-" + arena.killTokens); - - if (MemoryStorage.shop.getFileConfiguration().get(player.getName() + ".tokens") == null) { - MemoryStorage.shop.getFileConfiguration().set(player.getName() + ".tokens", 0); - MemoryStorage.shop.save(); - } - int playerTokens = MemoryStorage.shop.getFileConfiguration().getInt(player.getName() + ".tokens"); - float addingTokens = ((float) arena.hidersTokenWin - (((float) arena.timer / (float) arena.gameTime) * (float) arena.hidersTokenWin)); - MemoryStorage.shop.getFileConfiguration().set(player.getName() + ".tokens", playerTokens + (int) addingTokens); - MemoryStorage.shop.save(); - - MessageHelper.sendMessage(player, MessageKey.NORMAL_ADDED_TOKEN, "amount-" + (int) addingTokens); - - arena.seekers.add(player); - player.setWalkSpeed(0.3F); - ArenaHandler.sendMessage(arena, MessageKey.NORMAL_IN_GAME_HIDER_DIED, - "%playerName%-" + player.getDisplayName(), "killer-" + finalDamager.getDisplayName()); - - int hiderCount = (arena.playersInArena.size() - arena.seekers.size()); - if ((hiderCount <= 3) && (hiderCount > 0)) { - ListThe arena the player is in
+ * @param playerThe player to "kill"
+ * @param finalDamageDealerThe player that caused the last bit of damage
+ */ + private void killPlayer(Arena arena, Player player, Player finalDamageDealer) { + DisguiseAPI.undisguiseToAll(player); + MemoryStorage.playerBlock.remove(player); + + if (arena.hiders.contains(player)) { + killHider(arena, player, finalDamageDealer); + } + + player.getInventory().clear(); + + if (arena.seekers.size() >= arena.playersInArena.size()) { + ArenaHelper.seekersWin(arena); + } else { + DisguiseAPI.undisguiseToAll(player); + MemoryStorage.seekerTime.put(player, arena.waitingTimeSeeker); + PlayerHelper.teleport(player, arena.arenaLocations.getSeekersWarp()); + player.setGameMode(GameMode.SURVIVAL); + player.setWalkSpeed(0.3F); + + // Fix for client not showing players after they join + VisibilityHelper.makePlayerVisible(arena, player); } } + + /** + * "Kills" a hider in an arena + * + * @param arenaThe arena the player is in
+ * @param playerThe hider to "kill"
+ * @param finalDamageDealerThe player that caused the last bit of damage
+ */ + private void killHider(Arena arena, Player player, Player finalDamageDealer) { + int damageDealerTokens = TokensHelper.getTokens(finalDamageDealer); + TokensHelper.setTokens(finalDamageDealer, damageDealerTokens + arena.killTokens); + + MessageHelper.sendMessage(finalDamageDealer, MessageKey.NORMAL_ADDED_TOKEN, "amount-" + arena.killTokens); + + int playerTokens = TokensHelper.getTokens(player); + float addedTokens = ((float) arena.hidersTokenWin - (((float) arena.timer / (float) arena.gameTime) * + (float) arena.hidersTokenWin)); + TokensHelper.setTokens(player, playerTokens + (int) addedTokens); + + MessageHelper.sendMessage(player, MessageKey.NORMAL_ADDED_TOKEN, "amount-" + (int) addedTokens); + + arena.seekers.add(player); + player.setWalkSpeed(0.3F); + ArenaHelper.sendMessage(arena, MessageKey.NORMAL_IN_GAME_HIDER_DIED, + "%playerName%-" + player.getDisplayName(), "killer-" + finalDamageDealer.getDisplayName()); + + int hiderCount = arena.hiders.size(); + if ((hiderCount <= 3) && (hiderCount > 0)) { + ListThe arena to announce to
+ * @param messageThe message to display
+ * @param variablesThe variables to replace in the message
+ */ + public static void sendMessage(Arena arena, String message, String... variables) { + MessageHelper.broadcastMessage(arena.playersInArena, message, variables); + } + + /** + * Sends a message to all players in an arena + * + * @param arenaThe arena to announce to
+ * @param messageKeyThe message key defining the string to display
+ * @param variablesThe variables to replace in the message
+ */ + public static void sendMessage(Arena arena, MessageKey messageKey, String... variables) { + MessageHelper.broadcastMessage(arena.playersInArena, messageKey, variables); + } + + public static void playerJoinArena(Player player, String arenaName) { + if (MemoryStorage.playerArena.get(player) != null) { + MessageHelper.sendMessage(player, MessageKey.ERROR_JOIN_ALREADY_JOINED); + return; + } + + Arena arena = MemoryStorage.arenaMap.get(arenaName.toLowerCase()); + if (arena != null) { + // TODO: Use a disabled arena state instead of checking this condition every time + if (arena.disguiseBlocks.isEmpty()) { + MessageHelper.sendMessage(player, MessageKey.ERROR_JOIN_NO_BLOCKS_SET); + } else { + joinLobby(arena, player); + } + } else { + MessageHelper.sendMessage(player, MessageKey.ERROR_NO_ARENA, "name-" + arenaName); + } + + SignsHelper.updateSigns(); + } + + public static void playerLeaveArena(Player player, boolean message, boolean cleanup) { + Arena arena = MemoryStorage.playerArena.get(player); + if (arena == null) { + if (message) { + MessageHelper.sendMessage(player, MessageKey.ERROR_LEAVE_NOT_IN_ARENA); + } + return; + } + + BlockHunt.plugin.getLogger().log(Level.INFO, player.getName() + " has left " + arena.arenaName); + LeaveArenaEvent event = new LeaveArenaEvent(player, arena); + Bukkit.getPluginManager().callEvent(event); + + if (cleanup) { + cleanup(arena, player); + } + + PlayerArenaData playerArenaData = new PlayerArenaData(null, null, null, + null, null, null, null, null, null, + null, false); + + if (MemoryStorage.playerData.get(player) != null) { + playerArenaData = MemoryStorage.playerData.get(player); + } else { + BlockHunt.plugin.getLogger().log(Level.SEVERE, "Unable to find player data for " + player.getName() + + ". The player's state will be broken!"); + } + + player.getInventory().clear(); + player.getInventory().setContents(playerArenaData.playerInventory()); + player.getInventory().setArmorContents(playerArenaData.playerArmor()); + player.setExp(playerArenaData.playerEXP()); + player.setLevel(playerArenaData.playerEXPLevels()); + AttributeInstance healthAttribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH); + if (healthAttribute != null) { + healthAttribute.setBaseValue(playerArenaData.playerMaxHealth()); + } + player.setHealth(playerArenaData.playerHealth()); + player.setFoodLevel(playerArenaData.playerFood()); + player.addPotionEffects(playerArenaData.playerPotionEffects()); + PlayerHelper.teleport(player, arena.arenaLocations.getExitWarp()); + player.setGameMode(playerArenaData.playerGameMode()); + player.setAllowFlight(playerArenaData.playerFlying()); + player.setFlying(playerArenaData.playerFlying()); + player.setWalkSpeed(0.2F); + + MemoryStorage.playerData.remove(player); + MemoryStorage.chosenBlock.remove(player); + + VisibilityHelper.makePlayerUnhidden(player); + + ScoreboardHelper.removeScoreboard(player); + + MessageHelper.sendMessage(player, MessageKey.NORMAL_LEAVE_YOU_LEFT); + if (message) { + ArenaHelper.sendMessage(arena, MessageKey.NORMAL_LEAVE_LEFT_ARENA, "%playerName%-" + + player.getName(), "1-" + arena.playersInArena.size(), "2-" + arena.maxPlayers); + } + + SignsHelper.updateSigns(); + } + + private static void cleanup(Arena arena, Player player) { + arena.playersInArena.remove(player); + MemoryStorage.playerArena.remove(player); + arena.seekers.remove(player); + arena.hiders.remove(player); + MemoryStorage.playerArena.remove(player); + + if (arena.playersInArena.size() < arena.minPlayers && arena.gameState.equals(ArenaState.STARTING)) { + arena.gameState = ArenaState.WAITING; + arena.timer = 0; + + sendMessage(arena, MessageKey.WARNING_LOBBY_NEED_AT_LEAST, "1-" + arena.minPlayers); + } + + if (arena.playersInArena.size() <= 1 && arena.gameState == ArenaState.IN_GAME) { + if (arena.seekers.size() >= arena.playersInArena.size()) { + ArenaHelper.seekersWin(arena); + } else { + ArenaHelper.hidersWin(arena); + } + } + + if (arena.seekers.size() >= arena.playersInArena.size()) { + ArenaHelper.seekersWin(arena); + } + + if (arena.seekers.size() == 0 && arena.gameState == ArenaState.IN_GAME) { + Player seeker = arena.playersInArena.get(MemoryStorage.random.nextInt(arena.playersInArena.size())); + ArenaHelper.sendMessage(arena, MessageKey.WARNING_IN_GAME_NEW_SEEKER_CHOSEN, "seeker-" + seeker.getName()); + ArenaHelper.sendMessage(arena, MessageKey.NORMAL_IN_GAME_SEEKER_CHOSEN, "seeker-" + seeker.getName()); + DisguiseAPI.undisguiseToAll(seeker); + for (Player pl : Bukkit.getOnlinePlayers()) { + pl.showPlayer(BlockHunt.plugin, seeker); + } + seeker.getInventory().clear(); + arena.seekers.add(seeker); + PlayerHelper.teleport(seeker, arena.arenaLocations.getSeekersWarp()); + MemoryStorage.seekerTime.put(seeker, arena.waitingTimeSeeker); + seeker.setWalkSpeed(0.3F); + + // Fix for client not showing players after they join + VisibilityHelper.makePlayerVisible(arena, player); + } + } + + /** + * Grants rewards to the seekers, and stops the arena + * + * @param arenaThe arena in which the seekers won
+ */ + public static void seekersWin(Arena arena) { + String cause = "[BlockHunt] Seekers have won " + arena.arenaName; + rewardWinnersAndStop(arena, cause, arena.seekers, arena.seekersWinCommands, arena.seekersTokenWin, + MessageKey.NORMAL_WIN_SEEKERS); + } + + /** + * Grant rewards to the hiders, and stops the arena + * + * @param arenaThe arena in which the hiders won
+ */ + public static void hidersWin(Arena arena) { + String cause = "[BlockHunt] Hiders have won " + arena.arenaName; + rewardWinnersAndStop(arena, cause, arena.hiders, arena.hidersWinCommands, arena.hidersTokenWin, + MessageKey.NORMAL_WIN_HIDERS); + } + + /** + * Rewards winners of an arena and stops the arena + * + * @param arenaThe arena to grant rewards for
+ * @param causeThe cause of the arena stopping
+ * @param winnerTeamThe players on the team that won
+ * @param winCommandsThe commands to be executed for the winning team
+ * @param winTokensThe amount of tokens to grant to the winners
+ * @param winMessageThe message to display to the players in the arena regarding which team won
+ */ + private static void rewardWinnersAndStop(Arena arena, String cause, ListThe arena to stop
+ * @param winnersThe winners of the arena
+ * @param losersThe losers of the arena
+ * @param causeThe cause of why the arena was stopped
+ * @param messageThe message to display to players
+ */ + private static void stopArena(Arena arena, ListThe player to reward
+ * @param winCommandsThe commands to execute upon winning
+ * @param tokensThe amount of tokens to grant
+ */ + private static void grantRewards(Player player, ListThe arena to stop
+ * @param causeA description of why the arena was stopped
+ * @param messageThe message to display to affected players
+ */ + public static void stopArena(Arena arena, String cause, MessageKey message) { + BlockHunt.plugin.getLogger().log(Level.INFO, cause); + ArenaHelper.sendMessage(arena, message); + arena.seekers.clear(); + arena.hiders.clear(); + + for (Player player : arena.playersInArena) { + playerLeaveArena(player, false, false); + MemoryStorage.playerArena.remove(player); + player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 1); + } + + arena.gameState = ArenaState.WAITING; + arena.timer = 0; + arena.playersInArena.clear(); + } + + /** + * Checks whether any arena has any player + * + * @returnTrue if all arenas are empty
+ */ + public static boolean noPlayersInArenas() { + // Check if there are any players in any arena (quick way to early exit for event handlers) + for (Arena arena : MemoryStorage.arenaMap.values()) { + if (arena.playersInArena.size() > 0) { + return false; + } + } + return true; + } + + /** + * Makes the given player join the given arena's lobby + * + * @param arenaThe arena the player wants to join
+ * @param playerThe player that's joining the arena
+ */ + private static void joinLobby(Arena arena, Player player) { + // Deny the player if their inventory needs to be empty, and it's not + if ((Boolean) MemoryStorage.config.get(ConfigKey.REQUIRE_INVENTORY_CLEAR_ON_JOIN) && !isInventoryEmpty(player)) { + MessageHelper.sendMessage(player, MessageKey.ERROR_JOIN_INVENTORY_NOT_EMPTY); + return; + } + + // Check that the arena has been properly set up before allowing the player to play + // TODO: It would be better to have a DISABLED state for arenas until they are properly set up. + ArenaLocations locations = arena.arenaLocations; + if (!areWarpsSet(locations, player.getWorld())) { + MessageHelper.sendMessage(player, MessageKey.ERROR_JOIN_WARPS_NOT_SET); + return; + } + + // Make sure the game isn't already running + if (arena.gameState == ArenaState.IN_GAME) { + MessageHelper.sendMessage(player, MessageKey.ERROR_JOIN_ARENA_IN_GAME); + return; + } + + // Check if the arena is already full + if (arena.playersInArena.size() >= arena.maxPlayers && + !PermissionsManager.hasPermission(player, Permission.JOIN_FULL, false)) { + MessageHelper.sendMessage(player, MessageKey.ERROR_JOIN_FULL); + return; + } + + // Teleport the player to the arena + boolean canWarp = PlayerHelper.teleport(player, locations.getLobbyWarp()); + if (!canWarp) { + MessageHelper.sendMessage(player, MessageKey.ERROR_TELEPORT_FAILED); + return; + } + + BlockHunt.plugin.getLogger().log(Level.INFO, player.getName() + " has joined " + arena.arenaName); + arena.playersInArena.add(player); + MemoryStorage.playerArena.put(player, arena); + // Call the join event for any add-ons + Bukkit.getPluginManager().callEvent(new JoinArenaEvent(player, arena)); + + AttributeInstance healthAttribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH); + + // Store the player's data for restoration later + PlayerArenaData playerArenaData = new PlayerArenaData(player.getLocation(), player.getGameMode(), + player.getInventory().getContents(), player.getInventory().getArmorContents(), player.getExp(), + player.getLevel(), healthAttribute != null ? healthAttribute.getValue() : 20, player.getHealth(), + player.getFoodLevel(), player.getActivePotionEffects(), player.getAllowFlight()); + MemoryStorage.playerData.put(player, playerArenaData); + + // Set the player's state to the desired state + setArenaState(arena, player, healthAttribute); + + // Fix for client not showing players after they join + VisibilityHelper.makePlayerVisible(arena, player); + + // Give the player access to the block chooser + giveBlockChooser(player); + + // Give the player access to the hider/seeker chooser + giveHiderSeekerChooser(player); + + // Remove any existing disguise + DisguiseAPI.undisguiseToAll(player); + + // Announce that the player joined + ArenaHelper.sendMessage(arena, MessageKey.NORMAL_JOIN_JOINED_ARENA, "%playerName%-" + player.getName(), + "1-" + arena.playersInArena.size(), "2-" + arena.maxPlayers); + if (arena.playersInArena.size() < arena.minPlayers) { + // Announce that additional players are required for the arena to start + sendMessage(arena, MessageKey.WARNING_LOBBY_NEED_AT_LEAST, "1-" + arena.minPlayers); + } + } + + /** + * Gives a hider/seeker chooser to the given player if necessary + * + * @param playerThe player to give the hider/seeker chooser to
+ */ + private static void giveHiderSeekerChooser(Player player) { + // If not enabled, return + if (!((Boolean) MemoryStorage.config.get(ConfigKey.SHOP_BLOCK_HUNT_PASS_V_2_ENABLED))) { + return; + } + + // If the player is out of passes, don't give them the choice between hider and seeker + if (MemoryStorage.shop.getFileConfiguration().getInt(player.getName() + ".blockhuntpass") <= 0) { + return; + } + + Material chooserMaterial = Material.matchMaterial((String) MemoryStorage.config.get( + ConfigKey.SHOP_BLOCK_HUNT_PASS_V_2_ID_NAME)); + if (chooserMaterial == null) { + BlockHunt.plugin.getLogger().log(Level.SEVERE, "Cannot give the block chooser because an invalid" + + " material has been set."); + return; + } + ItemStack shopBlockHuntPass = new ItemStack(chooserMaterial, 1); + ItemMeta shopBlockHuntPassItemMeta = shopBlockHuntPass.getItemMeta(); + if (shopBlockHuntPassItemMeta == null) { + return; + } + shopBlockHuntPassItemMeta.setDisplayName(MessageHelper.replaceAll((String) MemoryStorage.config.get( + ConfigKey.SHOP_BLOCK_HUNT_PASS_V_2_NAME))); + ListThe player to give the block chooser to
+ */ + private static void giveBlockChooser(Player player) { + // If missing the necessary permission or if it's disabled, abort + if (!((Boolean) MemoryStorage.config.get(ConfigKey.SHOP_BLOCK_CHOOSER_V_1_ENABLED)) || + (MemoryStorage.shop.getFileConfiguration().get(player.getName() + ".blockchooser") == null && + !PermissionsManager.hasPermission(player, Permission.SHOP_BLOCK_CHOOSER, false))) { + return; + } + + Material chooserMaterial = Material.matchMaterial((String) MemoryStorage.config.get( + ConfigKey.SHOP_BLOCK_CHOOSER_V_1_ID_NAME)); + if (chooserMaterial == null) { + BlockHunt.plugin.getLogger().log(Level.SEVERE, "Cannot give the block chooser because an invalid" + + " material has been set."); + return; + } + + ItemStack shopBlockChooser = new ItemStack(chooserMaterial, 1); + ItemMeta shopBlockChooserItemMeta = shopBlockChooser.getItemMeta(); + if (shopBlockChooserItemMeta == null) { + return; + } + shopBlockChooserItemMeta.setDisplayName(MessageHelper.replaceAll((String) MemoryStorage.config.get( + ConfigKey.SHOP_BLOCK_CHOOSER_V_1_NAME))); + ListSets food and health to defaults, and clears the inventory among other things.
+ * + * @param arenaThe arena the player joined
+ * @param playerThe player to update the state for
+ * @param healthAttributeThe player's health attribute
+ */ + private static void setArenaState(Arena arena, Player player, AttributeInstance healthAttribute) { + player.setGameMode(GameMode.SURVIVAL); + for (PotionEffect potionEffect : player.getActivePotionEffects()) { + player.removePotionEffect(potionEffect.getType()); + } + player.setFoodLevel(20); + player.setHealth(20); + + if (healthAttribute != null) { + healthAttribute.setBaseValue(20); + } + player.setLevel(arena.timer); + player.setExp(0); + player.getInventory().clear(); + player.getInventory().setHelmet(new ItemStack(Material.AIR)); + player.getInventory().setChestplate(new ItemStack(Material.AIR)); + player.getInventory().setLeggings(new ItemStack(Material.AIR)); + player.getInventory().setBoots(new ItemStack(Material.AIR)); + player.setFlying(false); + player.setAllowFlight(false); + player.setWalkSpeed(0.2F); + } + + /** + * Checks whether the given player's inventory is completely empty + * + * @param playerThe player to check
+ * @returnTrue if the player's inventory is completely empty
+ */ + private static boolean isInventoryEmpty(Player player) { + for (ItemStack inventoryItem : player.getInventory()) { + if (inventoryItem != null && inventoryItem.getType() != Material.AIR) { + return false; + } + } + for (ItemStack inventoryItem : player.getInventory().getArmorContents()) { + if (inventoryItem != null && inventoryItem.getType() != Material.AIR) { + return false; + } + } + return true; + } + + /** + * Checks whether all warps are set in the given ArenaLocations object + * + * @param locationsThe arena locations to check
+ * @param worldThe world the arena belongs to
+ * @returnTrue if all warps have been properly set
+ */ + private static boolean areWarpsSet(ArenaLocations locations, World world) { + Location zero = new Location(world, 0, 0, 0, 0, 0); + return locations.getLobbyWarp() != null && locations.getHidersWarp() != null && + locations.getSeekersWarp() != null && locations.getExitWarp() != null && + !locations.getLobbyWarp().equals(zero) && !locations.getHidersWarp().equals(zero) && + !locations.getSeekersWarp().equals(zero) && !locations.getExitWarp().equals(zero); + } + +} diff --git a/src/main/java/net/knarcraft/blockhunt/InventoryHandler.java b/src/main/java/net/knarcraft/blockhunt/util/InventoryHelper.java similarity index 92% rename from src/main/java/net/knarcraft/blockhunt/InventoryHandler.java rename to src/main/java/net/knarcraft/blockhunt/util/InventoryHelper.java index 1ea6b3c..d695eda 100644 --- a/src/main/java/net/knarcraft/blockhunt/InventoryHandler.java +++ b/src/main/java/net/knarcraft/blockhunt/util/InventoryHelper.java @@ -1,12 +1,12 @@ -package net.knarcraft.blockhunt; +package net.knarcraft.blockhunt.util; +import net.knarcraft.blockhunt.MemoryStorage; import net.knarcraft.blockhunt.arena.Arena; import net.knarcraft.blockhunt.arena.ArenaProperty; import net.knarcraft.blockhunt.config.ConfigKey; import net.knarcraft.blockhunt.config.MessageKey; import net.knarcraft.blockhunt.config.Permission; import net.knarcraft.blockhunt.manager.PermissionsManager; -import net.knarcraft.blockhunt.util.MessageHelper; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -17,7 +17,11 @@ import org.bukkit.inventory.meta.ItemMeta; import java.util.ArrayList; import java.util.List; -public class InventoryHandler { +public final class InventoryHelper { + + private InventoryHelper() { + + } public static void openPanel(Player player, String arenaName) { @@ -183,23 +187,19 @@ public class InventoryHandler { public static void openShop(Player player) { Inventory shop = Bukkit.createInventory(null, 9, MessageHelper.replaceAll("\u00A7r" + MemoryStorage.config.get(ConfigKey.SHOP_TITLE))); - if (MemoryStorage.shop.getFileConfiguration().get(player.getName() + ".tokens") == null) { - MemoryStorage.shop.getFileConfiguration().set(player.getName() + ".tokens", 0); - MemoryStorage.shop.save(); - } - int playerTokens = MemoryStorage.shop.getFileConfiguration().getInt(player.getName() + ".tokens"); + int playerTokens = TokensHelper.getTokens(player); ListThe player to set tokens for
+ * @param tokensThe amount of tokens to set
+ */ + public static void setTokens(Player player, int tokens) { + MemoryStorage.shop.getFileConfiguration().set(player.getName() + ".tokens", tokens); + MemoryStorage.shop.save(); + } + + /** + * Gets a player's current tokens + * + * @param playerThe player to get tokens for
+ * @returnThe player's current tokens
+ */ + public static int getTokens(Player player) { + initializeTokens(player); + return MemoryStorage.shop.getFileConfiguration().getInt(player.getName() + ".tokens"); + } + + /** + * Makes sure the given player's tokens is initialized and not null + * + * @param playerThe player whose tokens should be initialized
+ */ + private static void initializeTokens(Player player) { + if (MemoryStorage.shop.getFileConfiguration().get(player.getName() + ".tokens") == null) { + MemoryStorage.shop.getFileConfiguration().set(player.getName() + ".tokens", 0); + MemoryStorage.shop.save(); + } + } + +} diff --git a/src/main/java/net/knarcraft/blockhunt/util/VisibilityHelper.java b/src/main/java/net/knarcraft/blockhunt/util/VisibilityHelper.java new file mode 100644 index 0000000..599ba19 --- /dev/null +++ b/src/main/java/net/knarcraft/blockhunt/util/VisibilityHelper.java @@ -0,0 +1,194 @@ +package net.knarcraft.blockhunt.util; + +import me.libraryaddict.disguise.DisguiseAPI; +import me.libraryaddict.disguise.disguisetypes.DisguiseType; +import me.libraryaddict.disguise.disguisetypes.MiscDisguise; +import net.knarcraft.blockhunt.BlockHunt; +import net.knarcraft.blockhunt.MemoryStorage; +import net.knarcraft.blockhunt.arena.Arena; +import net.knarcraft.blockhunt.config.MessageKey; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.block.Block; +import org.bukkit.block.data.BlockData; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import java.util.Objects; +import java.util.logging.Level; + +import static net.knarcraft.blockhunt.util.StringHelper.uppercaseAllFirst; + +/** + * A helper class for editing player visibility + */ +public final class VisibilityHelper { + + private VisibilityHelper() { + + } + + /** + * Makes a player visible to players in an arena and the other way around + * + * @param arenaThe arena the player was in
+ * @param playerThe player to make visible
+ */ + public static void makePlayerVisible(Arena arena, Player player) { + for (Player otherPlayer : arena.playersInArena) { + if (otherPlayer.canSee(player)) { + // Make player visible to others + otherPlayer.showPlayer(BlockHunt.plugin, player); + } + if (player.canSee(otherPlayer)) { + // Make other players visible to player + player.showPlayer(BlockHunt.plugin, otherPlayer); + } + } + } + + /** + * Makes a hidden player in an arena no longer appear as hidden + * + *This should be used when a player leaves an arena or the server to make sure no remnants of the hidden block + * remains
+ * + * @param playerThe player to un-hide
+ */ + public static void makePlayerUnhidden(Player player) { + // Un-disguise the player + DisguiseAPI.undisguiseToAll(player); + + // Get the block data for the player + BlockData hiddenBlockData = null; + if (MemoryStorage.hiddenLocationMaterial.get(player) != null) { + hiddenBlockData = Bukkit.createBlockData(MemoryStorage.hiddenLocationMaterial.get(player)); + } + + for (Player onlinePlayer : Bukkit.getOnlinePlayers()) { + // Make the player visible to other players + onlinePlayer.showPlayer(BlockHunt.plugin, player); + + // No longer display the player's solid block + if (hiddenBlockData != null) { + Block playerBlock = MemoryStorage.hiddenLocation.get(player).getBlock(); + onlinePlayer.sendBlockChange(playerBlock.getLocation(), hiddenBlockData); + } + } + } + + /** + * Makes the player into a no longer solid block + * + * @param playerThe player to make unsolid
+ */ + public static void makePlayerUnSolid(Player player) { + ItemStack block = player.getInventory().getItem(8); + if (block == null) { + // This shouldn't be possible, but just in case + player.sendMessage(ChatColor.RED + "Unable to hide you because your inventory block is missing!"); + BlockHunt.plugin.getLogger().log(Level.SEVERE, player.getName() + " could not be hidden because " + + "their inventory block was missing!"); + return; + } + + Block playerBlock = player.getLocation().getBlock(); + if (MemoryStorage.hiddenLocation.get(player) != null) { + playerBlock = MemoryStorage.hiddenLocation.get(player).getBlock(); + } + + block.setAmount(5); + for (Player otherPlayer : Bukkit.getOnlinePlayers()) { + if (otherPlayer.equals(player)) { + continue; + } + + // Restore the block the player replaced + Material material = MemoryStorage.hiddenLocationMaterial.get(player); + otherPlayer.sendBlockChange(playerBlock.getLocation(), + Bukkit.createBlockData(Objects.requireNonNullElse(material, Material.AIR))); + MemoryStorage.hiddenLocationMaterial.remove(player); + } + + player.playSound(player.getLocation(), Sound.ENTITY_BAT_HURT, 1, 1); + block.removeEnchantment(Enchantment.DURABILITY); + + for (Player playerShow : Bukkit.getOnlinePlayers()) { + playerShow.showPlayer(BlockHunt.plugin, player); + } + + MiscDisguise disguise = new MiscDisguise(DisguiseType.FALLING_BLOCK, block.getType()); + DisguiseAPI.disguiseToAll(player, disguise); + + MessageHelper.sendMessage(player, MessageKey.NORMAL_IN_GAME_NO_MORE_SOLID); + } + + /** + * Tries to make the given player solid + * + * @param playerThe player to make solid
+ * @param solidBlockThe block to solidify the player as
+ */ + public static void makePlayerSolid(Player player, ItemStack solidBlock) { + Block playerBlock = player.getLocation().getBlock(); + BlockData playerBlockData = playerBlock.getBlockData(); + if (playerBlockData.getMaterial().isAir() || !playerBlockData.getMaterial().isSolid()) { + makePlayerSolid(player, playerBlock, playerBlockData, solidBlock, player.getLocation()); + } else { + MessageHelper.sendMessage(player, MessageKey.WARNING_IN_GAME_NO_SOLID_PLACE); + } + } + + /** + * Makes a player into a perceived solid block + * + * @param playerThe player to make solid
+ * @param playerBlockThe block the player is currently standing at
+ * @param playerBlockDataThe data of the block the player is currently standing at
+ * @param inventoryBlockThe inventory block which corresponds to the player's hide material
+ * @param playerLocationThe current location of the player
+ */ + private static void makePlayerSolid(Player player, Block playerBlock, BlockData playerBlockData, ItemStack inventoryBlock, + Location playerLocation) { + // Store the material the player replaced + MemoryStorage.hiddenLocationMaterial.put(player, playerBlockData.getMaterial()); + + if (DisguiseAPI.isDisguised(player)) { + // Hide the player, and make all other players see a full block in the player's location + DisguiseAPI.undisguiseToAll(player); + for (Player onlinePlayer : Bukkit.getOnlinePlayers()) { + if (!onlinePlayer.equals(player)) { + onlinePlayer.hidePlayer(BlockHunt.plugin, player); + onlinePlayer.sendBlockChange(playerBlock.getLocation(), + inventoryBlock.getType().createBlockData()); + } + } + + inventoryBlock.addUnsafeEnchantment(Enchantment.DURABILITY, 10); + player.playSound(playerLocation, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); + // Store the location the player is hidden at + MemoryStorage.hiddenLocation.put(player, playerLocation); + + // Announce to the player that they are now hidden + String blockName = inventoryBlock.getType().name(); + blockName = uppercaseAllFirst(blockName.replace("_", " ")); + MessageHelper.sendMessage(player, MessageKey.NORMAL_IN_GAME_NOW_SOLID, "block-" + + blockName); + } + + for (Player otherPlayer : Bukkit.getOnlinePlayers()) { + if (otherPlayer.equals(player)) { + continue; + } + + // Hide the player and update the perceived + otherPlayer.hidePlayer(BlockHunt.plugin, player); + otherPlayer.sendBlockChange(playerBlock.getLocation(), inventoryBlock.getType().createBlockData()); + } + } + +}