diff options
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/events')
3 files changed, 34 insertions, 29 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java index ec94803..dec3b0f 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java @@ -1,7 +1,5 @@ package net.tylermurphy.hideAndSeek.events; -import static net.tylermurphy.hideAndSeek.Store.*; - import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -27,12 +25,8 @@ public class Glow { private void startGlow() { running = true; - for(String hiderName : Hider) { - Player hider = playerList.get(hiderName); - if(hider == null) continue; - for(String seekerName : Seeker) { - Player seeker = playerList.get(seekerName); - if(seeker == null) continue; + for(Player hider : Main.plugin.board.getHiders()) { + for(Player seeker : Main.plugin.board.getSeekers()) { Packet.setGlow(hider, seeker, true); } } @@ -42,7 +36,7 @@ public class Glow { private void waitGlow() { Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() { public void run() { - if(temp != gameId) return; + if(temp != Main.plugin.gameId) return; glowTime--; glowTime = Math.max(glowTime, 0); if(glowTime == 0) { @@ -55,12 +49,8 @@ public class Glow { } private void stopGlow() { - for(String hiderName : Hider) { - Player hider = playerList.get(hiderName); - if(hider == null) continue; - for(String seekerName : Seeker) { - Player seeker = playerList.get(seekerName); - if(seeker == null) continue; + for(Player hider : Main.plugin.board.getHiders()) { + for(Player seeker : Main.plugin.board.getSeekers()) { Packet.setGlow(hider, seeker, false); } } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java index 0890832..4ce7dc4 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java @@ -1,6 +1,6 @@ package net.tylermurphy.hideAndSeek.events; -import static net.tylermurphy.hideAndSeek.Store.*; +import static net.tylermurphy.hideAndSeek.Config.*; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.meta.FireworkMeta; import net.tylermurphy.hideAndSeek.Main; -import net.tylermurphy.hideAndSeek.util.Functions; +import net.tylermurphy.hideAndSeek.util.Util; public class Taunt { @@ -40,7 +40,7 @@ public class Taunt { } private void tryTaunt() { - if(temp != gameId) return; + if(temp != Main.plugin.gameId) return; if(Math.random() > .8) { executeTaunt(); } else { @@ -54,9 +54,9 @@ public class Taunt { private void executeTaunt() { Player taunted = null; - int rand = (int) (Math.random()*Hider.size()); - for(Player player : playerList.values()) { - if(Hider.contains(player.getName())) { + int rand = (int) (Math.random()*Main.plugin.board.sizeHider()); + for(Player player : Main.plugin.board.getPlayers()) { + if(Main.plugin.board.isHider(player)) { rand--; if(rand==0) { taunted = player; @@ -66,12 +66,12 @@ public class Taunt { } if(taunted != null) { taunted.sendMessage(ChatColor.RED + "" + ChatColor.ITALIC + "Oh no! You have been chosed to be taunted."); - Functions.broadcastMessage(tauntPrefix + " A random hider will be taunted in the next 30s"); + Util.broadcastMessage(tauntPrefix + " A random hider will be taunted in the next 30s"); tauntPlayer = taunted.getName(); Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() { public void run() { - if(temp != gameId) return; - Player taunted = playerList.get(tauntPlayer); + if(temp != Main.plugin.gameId) return; + Player taunted = Main.plugin.board.getPlayer(tauntPlayer); if(taunted != null) { Firework fw = (Firework) taunted.getLocation().getWorld().spawnEntity(taunted.getLocation(), EntityType.FIREWORK); FireworkMeta fwm = fw.getFireworkMeta(); @@ -87,7 +87,7 @@ public class Taunt { .withTrail() .build()); fw.setFireworkMeta(fwm); - Functions.broadcastMessage(tauntPrefix + " Taunt has been activated"); + Util.broadcastMessage(tauntPrefix + " Taunt has been activated"); } tauntPlayer = ""; waitTaunt(); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java index 04bddfb..70c4986 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java @@ -5,9 +5,9 @@ import org.bukkit.World; import org.bukkit.WorldBorder; import net.tylermurphy.hideAndSeek.Main; -import net.tylermurphy.hideAndSeek.util.Functions; +import net.tylermurphy.hideAndSeek.util.Util; -import static net.tylermurphy.hideAndSeek.Store.*; +import static net.tylermurphy.hideAndSeek.Config.*; public class Worldborder { @@ -26,9 +26,9 @@ public class Worldborder { } private void decreaceWorldborder() { - if(temp != gameId) return; + if(temp != Main.plugin.gameId) return; if(currentWorldborderSize-100 > 100) { - Functions.broadcastMessage(worldborderPrefix + "Worldborder decreacing by 100 blocks over the next 30s"); + Util.broadcastMessage(worldborderPrefix + "Worldborder decreacing by 100 blocks over the next 30s"); currentWorldborderSize -= 100; World world = Bukkit.getWorld("hideandseek_"+spawnWorld); WorldBorder border = world.getWorldBorder(); @@ -41,4 +41,19 @@ public class Worldborder { } } + public static void resetWorldborder(String worldName) { + if(worldborderEnabled) { + World world = Bukkit.getWorld(worldName); + WorldBorder border = world.getWorldBorder(); + border.setSize(worldborderSize); + border.setCenter(worldborderPosition.getX(), worldborderPosition.getZ()); + currentWorldborderSize = worldborderSize; + } else { + World world = Bukkit.getWorld(worldName); + WorldBorder border = world.getWorldBorder(); + border.setSize(30000000); + border.setCenter(0, 0); + } + } + } |