diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index ca5a70108..fc29e4b26 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -72,7 +72,7 @@ public class HubManager extends MiniClientPlugin private CoreClientManager _clientManager; private DonationManager _donationManager; private DisguiseManager _disguiseManager; - + private Tutorial _tutorial; private TextCreator _textCreator; @@ -97,9 +97,9 @@ public class HubManager extends MiniClientPlugin _spawn = new Location(UtilWorld.getWorld("world"), 0.5, 74, 0.5); _textCreator = new TextCreator(this); - + new Dragon(this); - + _tutorial = new Tutorial(this, _textCreator, donationManager, taskManager); DragonTextB = GetDragonText(); @@ -153,33 +153,33 @@ public class HubManager extends MiniClientPlugin { event.setRespawnLocation(GetSpawn()); } - - @EventHandler(priority = EventPriority.MONITOR) - public void OnChunkLoad(ChunkLoadEvent event) - { - for (Entity entity : event.getChunk().getEntities()) - { - if (entity instanceof LivingEntity) - { - if (((LivingEntity)entity).isCustomNameVisible() && ((LivingEntity)entity).getCustomName() != null) - { - if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("play minekart plz")) - { - _disguiseManager.disguise(new DisguisePlayer(entity, "Play " + ChatColor.YELLOW + "MineKart")); - } - else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("defek7")) - _disguiseManager.disguise(new DisguisePlayer(entity, "defek7")); - else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("chiss")) - _disguiseManager.disguise(new DisguisePlayer(entity, "Chiss")); - else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("Sterling_")) - _disguiseManager.disguise(new DisguisePlayer(entity, "sterling_")); - else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("Spu_")) - _disguiseManager.disguise(new DisguisePlayer(entity, "Spu_")); - } - } - } - } - + + @EventHandler(priority = EventPriority.MONITOR) + public void OnChunkLoad(ChunkLoadEvent event) + { + for (Entity entity : event.getChunk().getEntities()) + { + if (entity instanceof LivingEntity) + { + if (((LivingEntity)entity).isCustomNameVisible() && ((LivingEntity)entity).getCustomName() != null) + { + if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("play minekart plz")) + { + _disguiseManager.disguise(new DisguisePlayer(entity, "Play " + ChatColor.YELLOW + "MineKart")); + } + else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("defek7")) + _disguiseManager.disguise(new DisguisePlayer(entity, "defek7")); + else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("chiss")) + _disguiseManager.disguise(new DisguisePlayer(entity, "Chiss")); + else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("Sterling_")) + _disguiseManager.disguise(new DisguisePlayer(entity, "sterling_")); + else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("Spu_")) + _disguiseManager.disguise(new DisguisePlayer(entity, "Spu_")); + } + } + } + } + @EventHandler(priority = EventPriority.LOW) public void PlayerJoin(PlayerJoinEvent event) { @@ -223,7 +223,7 @@ public class HubManager extends MiniClientPlugin //Add Self to Other otherPlayer.getScoreboard().getTeam(_clientManager.Get(player).GetRank().Name).addPlayer(player); } - + board.getTeam(Rank.OWNER.Name).addPlayer(Bukkit.getOfflinePlayer("Chiss")); board.getTeam(Rank.OWNER.Name).addPlayer(Bukkit.getOfflinePlayer("defek7")); board.getTeam(Rank.OWNER.Name).addPlayer(Bukkit.getOfflinePlayer("Spu_")); @@ -262,7 +262,7 @@ public class HubManager extends MiniClientPlugin { if (_tutorial.InTutorial(other)) continue; - + UtilPlayer.message(other, rankStr + C.cYellow + player.getName() + " " + C.cWhite + event.getMessage()); } } @@ -609,7 +609,7 @@ public class HubManager extends MiniClientPlugin { event.blockList().clear(); } - + @EventHandler public void VineGrow(BlockSpreadEvent event) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index e7daa2c08..b28ab69c8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -64,7 +64,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat private Fire _fire; private FireworkHandler _firework; private ProjectileManager _projectileManager; - + private Portal _portal; private ArcadeShop _arcadeShop; @@ -76,7 +76,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat private GameManager _gameManager; private GameLobbyManager _gameLobbyManager; private GameWorldManager _gameWorldManager; - + //Server Games private GameServerConfig _serverConfig; @@ -88,44 +88,44 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat super("Game Manager", plugin); _serverConfig = serverConfig; - + //Modules _blockRestore = new BlockRestore(plugin); - + _blood = blood; - + _explosionManager = new Explosion(plugin, _blockRestore); _explosionManager.SetDebris(false); - + _conditionManager = conditionManager; - + _clientManager = clientManager; - + _chat = new Chat(plugin, _clientManager, this); - + _creature = creature; - + _damageManager = damageManager; _damageManager.UseDefaultWeaponDamage = true; - + _disguiseManager = disguiseManager; - + _donationManager = donationManager; _firework = new FireworkHandler(); - + _projectileManager = new ProjectileManager(plugin); - + _fire = new Fire(plugin, conditionManager, damageManager); - + _portal = new Portal(plugin); - + //Shop _arcadeShop = new ArcadeShop(this, clientManager, donationManager); //Game Factory _gameFactory = new GameFactory(this); - + //Managers _gameChatManager = new GameChatManager(this); _gameCreationManager = new GameCreationManager(this); @@ -137,7 +137,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat _gameWorldManager = new GameWorldManager(this); new MiscManager(this); new IdleManager(this); - + //Game Addons new CompassAddon(plugin, this); new SoupAddon(plugin, this); @@ -151,7 +151,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat AddCommand(new GemCommand(this)); AddCommand(new WriteCommand(this)); } - + public GameServerConfig GetServerConfig() { return _serverConfig; @@ -161,7 +161,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat { return GetServerConfig().GameList; } - + public Blood GetBlood() { return _blood; @@ -176,7 +176,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat { return _blockRestore; } - + public CoreClientManager GetClients() { return _clientManager; @@ -186,7 +186,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat { return _conditionManager; } - + public Creature GetCreature() { return _creature; @@ -196,7 +196,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat { return _disguiseManager; } - + public DamageManager GetDamage() { return _damageManager; @@ -221,42 +221,42 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat { return _projectileManager; } - + public Portal GetPortal() { return _portal; } - + public GameLobbyManager GetLobby() { return _gameLobbyManager; } - + public ArcadeShop GetShop() { return _arcadeShop; } - + public GameCreationManager GetGameCreationManager() { return _gameCreationManager; } - + public GameFactory GetGameFactory() { return _gameFactory; } - + public GameManager GetGameManager() { return _gameManager; } - + public GameGemManager GetGameGemManager() { return _gameGemManager; } - + public GameWorldManager GetGameWorldManager() { return _gameWorldManager; @@ -326,7 +326,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat if (_game.IsPlaying(player)) return false; - + return true; } @@ -343,14 +343,14 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat { event.setMotd(ChatColor.GREEN + "Recruiting"); } - + } else { event.setMotd(ChatColor.YELLOW + "In Progress"); } } - + @EventHandler public void MessageJoin(PlayerJoinEvent event) { @@ -363,7 +363,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat event.setQuitMessage(F.sys("Quit", GetColor(event.getPlayer()) + event.getPlayer().getName())); } - + public Game GetGame() { @@ -385,14 +385,14 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat return GetServerConfig().MaxPlayers; } - - + + public void HubClock(Player player) { player.getInventory().setItem(8, ItemStackFactory.Instance.CreateStack(Material.WATCH, (byte)0, 1, (short)0, C.cGreen + "Return to Hub", new String[] {"", ChatColor.RESET + "Click while holding this", ChatColor.RESET + "to return to the Hub."})); } - + @EventHandler(priority = EventPriority.LOWEST) public void HubClockInteract(PlayerInteractEvent event) { @@ -409,7 +409,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat _portal.SendPlayerToServer(player, "Lobby"); } - + public boolean IsAlive(Player player) { if (_game == null) @@ -417,7 +417,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat return _game.IsAlive(player); } - + public void Clear(Player player) { player.setGameMode(GameMode.SURVIVAL); @@ -433,9 +433,9 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat ((CraftPlayer)player).getHandle().m = true; GetCondition().EndCondition(player, ConditionType.CLOAK, "Spectator"); - + HubClock(player); - + GetDisguise().undisguise(player); } @@ -447,17 +447,17 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat ArrayList maps = new ArrayList(); System.out.println("Searching Maps in: " + folder); - + for (File file : folder.listFiles()) { if (!file.isFile()) continue; - + String name = file.getName(); if (name.length() < 5) continue; - + name = name.substring(name.length()-4, name.length()); if (file.getName().equals(".zip"))