JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WHITE SPACE CHANGES!

Browse Source
This commit is contained in:
Chiss 2013-09-05 07:44:53 +10:00
parent 010336983a
commit 87fa103711
2 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -72,7 +72,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
private CoreClientManager _clientManager; private CoreClientManager _clientManager;
private DonationManager _donationManager; private DonationManager _donationManager;
private DisguiseManager _disguiseManager; private DisguiseManager _disguiseManager;
private Tutorial _tutorial; private Tutorial _tutorial;
private TextCreator _textCreator; private TextCreator _textCreator;
@ -97,9 +97,9 @@ public class HubManager extends MiniClientPlugin<HubClient>
_spawn = new Location(UtilWorld.getWorld("world"), 0.5, 74, 0.5); _spawn = new Location(UtilWorld.getWorld("world"), 0.5, 74, 0.5);
_textCreator = new TextCreator(this); _textCreator = new TextCreator(this);
new Dragon(this); new Dragon(this);
_tutorial = new Tutorial(this, _textCreator, donationManager, taskManager); _tutorial = new Tutorial(this, _textCreator, donationManager, taskManager);
DragonTextB = GetDragonText(); DragonTextB = GetDragonText();
@ -153,33 +153,33 @@ public class HubManager extends MiniClientPlugin<HubClient>
{ {
event.setRespawnLocation(GetSpawn()); event.setRespawnLocation(GetSpawn());
} }
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void OnChunkLoad(ChunkLoadEvent event) public void OnChunkLoad(ChunkLoadEvent event)
{ {
for (Entity entity : event.getChunk().getEntities()) for (Entity entity : event.getChunk().getEntities())
{ {
if (entity instanceof LivingEntity) if (entity instanceof LivingEntity)
{ {
if (((LivingEntity)entity).isCustomNameVisible() && ((LivingEntity)entity).getCustomName() != null) if (((LivingEntity)entity).isCustomNameVisible() && ((LivingEntity)entity).getCustomName() != null)
{ {
if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("play minekart plz")) if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("play minekart plz"))
{ {
_disguiseManager.disguise(new DisguisePlayer(entity, "Play " + ChatColor.YELLOW + "MineKart")); _disguiseManager.disguise(new DisguisePlayer(entity, "Play " + ChatColor.YELLOW + "MineKart"));
} }
else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("defek7")) else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("defek7"))
_disguiseManager.disguise(new DisguisePlayer(entity, "defek7")); _disguiseManager.disguise(new DisguisePlayer(entity, "defek7"));
else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("chiss")) else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("chiss"))
_disguiseManager.disguise(new DisguisePlayer(entity, "Chiss")); _disguiseManager.disguise(new DisguisePlayer(entity, "Chiss"));
else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("Sterling_")) else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("Sterling_"))
_disguiseManager.disguise(new DisguisePlayer(entity, "sterling_")); _disguiseManager.disguise(new DisguisePlayer(entity, "sterling_"));
else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("Spu_")) else if (((LivingEntity)entity).getCustomName().equalsIgnoreCase("Spu_"))
_disguiseManager.disguise(new DisguisePlayer(entity, "Spu_")); _disguiseManager.disguise(new DisguisePlayer(entity, "Spu_"));
} }
} }
} }
} }
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
public void PlayerJoin(PlayerJoinEvent event) public void PlayerJoin(PlayerJoinEvent event)
{ {
@ -223,7 +223,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
//Add Self to Other //Add Self to Other
otherPlayer.getScoreboard().getTeam(_clientManager.Get(player).GetRank().Name).addPlayer(player); 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("Chiss"));
board.getTeam(Rank.OWNER.Name).addPlayer(Bukkit.getOfflinePlayer("defek7")); board.getTeam(Rank.OWNER.Name).addPlayer(Bukkit.getOfflinePlayer("defek7"));
board.getTeam(Rank.OWNER.Name).addPlayer(Bukkit.getOfflinePlayer("Spu_")); board.getTeam(Rank.OWNER.Name).addPlayer(Bukkit.getOfflinePlayer("Spu_"));
@ -262,7 +262,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
{ {
if (_tutorial.InTutorial(other)) if (_tutorial.InTutorial(other))
continue; continue;
UtilPlayer.message(other, rankStr + C.cYellow + player.getName() + " " + C.cWhite + event.getMessage()); UtilPlayer.message(other, rankStr + C.cYellow + player.getName() + " " + C.cWhite + event.getMessage());
} }
} }
@ -609,7 +609,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
{ {
event.blockList().clear(); event.blockList().clear();
} }
@EventHandler @EventHandler
public void VineGrow(BlockSpreadEvent event) public void VineGrow(BlockSpreadEvent event)
{ {

90
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -64,7 +64,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
private Fire _fire; private Fire _fire;
private FireworkHandler _firework; private FireworkHandler _firework;
private ProjectileManager _projectileManager; private ProjectileManager _projectileManager;
private Portal _portal; private Portal _portal;
private ArcadeShop _arcadeShop; private ArcadeShop _arcadeShop;
@ -76,7 +76,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
private GameManager _gameManager; private GameManager _gameManager;
private GameLobbyManager _gameLobbyManager; private GameLobbyManager _gameLobbyManager;
private GameWorldManager _gameWorldManager; private GameWorldManager _gameWorldManager;
//Server Games //Server Games
private GameServerConfig _serverConfig; private GameServerConfig _serverConfig;
@ -88,44 +88,44 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
super("Game Manager", plugin); super("Game Manager", plugin);
_serverConfig = serverConfig; _serverConfig = serverConfig;
//Modules //Modules
_blockRestore = new BlockRestore(plugin); _blockRestore = new BlockRestore(plugin);
_blood = blood; _blood = blood;
_explosionManager = new Explosion(plugin, _blockRestore); _explosionManager = new Explosion(plugin, _blockRestore);
_explosionManager.SetDebris(false); _explosionManager.SetDebris(false);
_conditionManager = conditionManager; _conditionManager = conditionManager;
_clientManager = clientManager; _clientManager = clientManager;
_chat = new Chat(plugin, _clientManager, this); _chat = new Chat(plugin, _clientManager, this);
_creature = creature; _creature = creature;
_damageManager = damageManager; _damageManager = damageManager;
_damageManager.UseDefaultWeaponDamage = true; _damageManager.UseDefaultWeaponDamage = true;
_disguiseManager = disguiseManager; _disguiseManager = disguiseManager;
_donationManager = donationManager; _donationManager = donationManager;
_firework = new FireworkHandler(); _firework = new FireworkHandler();
_projectileManager = new ProjectileManager(plugin); _projectileManager = new ProjectileManager(plugin);
_fire = new Fire(plugin, conditionManager, damageManager); _fire = new Fire(plugin, conditionManager, damageManager);
_portal = new Portal(plugin); _portal = new Portal(plugin);
//Shop //Shop
_arcadeShop = new ArcadeShop(this, clientManager, donationManager); _arcadeShop = new ArcadeShop(this, clientManager, donationManager);
//Game Factory //Game Factory
_gameFactory = new GameFactory(this); _gameFactory = new GameFactory(this);
//Managers //Managers
_gameChatManager = new GameChatManager(this); _gameChatManager = new GameChatManager(this);
_gameCreationManager = new GameCreationManager(this); _gameCreationManager = new GameCreationManager(this);
@ -137,7 +137,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
_gameWorldManager = new GameWorldManager(this); _gameWorldManager = new GameWorldManager(this);
new MiscManager(this); new MiscManager(this);
new IdleManager(this); new IdleManager(this);
//Game Addons //Game Addons
new CompassAddon(plugin, this); new CompassAddon(plugin, this);
new SoupAddon(plugin, this); new SoupAddon(plugin, this);
@ -151,7 +151,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
AddCommand(new GemCommand(this)); AddCommand(new GemCommand(this));
AddCommand(new WriteCommand(this)); AddCommand(new WriteCommand(this));
} }
public GameServerConfig GetServerConfig() public GameServerConfig GetServerConfig()
{ {
return _serverConfig; return _serverConfig;
@ -161,7 +161,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
{ {
return GetServerConfig().GameList; return GetServerConfig().GameList;
} }
public Blood GetBlood() public Blood GetBlood()
{ {
return _blood; return _blood;
@ -176,7 +176,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
{ {
return _blockRestore; return _blockRestore;
} }
public CoreClientManager GetClients() public CoreClientManager GetClients()
{ {
return _clientManager; return _clientManager;
@ -186,7 +186,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
{ {
return _conditionManager; return _conditionManager;
} }
public Creature GetCreature() public Creature GetCreature()
{ {
return _creature; return _creature;
@ -196,7 +196,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
{ {
return _disguiseManager; return _disguiseManager;
} }
public DamageManager GetDamage() public DamageManager GetDamage()
{ {
return _damageManager; return _damageManager;
@ -221,42 +221,42 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
{ {
return _projectileManager; return _projectileManager;
} }
public Portal GetPortal() public Portal GetPortal()
{ {
return _portal; return _portal;
} }
public GameLobbyManager GetLobby() public GameLobbyManager GetLobby()
{ {
return _gameLobbyManager; return _gameLobbyManager;
} }
public ArcadeShop GetShop() public ArcadeShop GetShop()
{ {
return _arcadeShop; return _arcadeShop;
} }
public GameCreationManager GetGameCreationManager() public GameCreationManager GetGameCreationManager()
{ {
return _gameCreationManager; return _gameCreationManager;
} }
public GameFactory GetGameFactory() public GameFactory GetGameFactory()
{ {
return _gameFactory; return _gameFactory;
} }
public GameManager GetGameManager() public GameManager GetGameManager()
{ {
return _gameManager; return _gameManager;
} }
public GameGemManager GetGameGemManager() public GameGemManager GetGameGemManager()
{ {
return _gameGemManager; return _gameGemManager;
} }
public GameWorldManager GetGameWorldManager() public GameWorldManager GetGameWorldManager()
{ {
return _gameWorldManager; return _gameWorldManager;
@ -326,7 +326,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
if (_game.IsPlaying(player)) if (_game.IsPlaying(player))
return false; return false;
return true; return true;
} }
@ -343,14 +343,14 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
{ {
event.setMotd(ChatColor.GREEN + "Recruiting"); event.setMotd(ChatColor.GREEN + "Recruiting");
} }
} }
else else
{ {
event.setMotd(ChatColor.YELLOW + "In Progress"); event.setMotd(ChatColor.YELLOW + "In Progress");
} }
} }
@EventHandler @EventHandler
public void MessageJoin(PlayerJoinEvent event) 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())); event.setQuitMessage(F.sys("Quit", GetColor(event.getPlayer()) + event.getPlayer().getName()));
} }
public Game GetGame() public Game GetGame()
{ {
@ -385,14 +385,14 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
return GetServerConfig().MaxPlayers; return GetServerConfig().MaxPlayers;
} }
public void HubClock(Player player) public void HubClock(Player player)
{ {
player.getInventory().setItem(8, ItemStackFactory.Instance.CreateStack(Material.WATCH, (byte)0, 1, (short)0, C.cGreen + "Return to Hub", 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."})); new String[] {"", ChatColor.RESET + "Click while holding this", ChatColor.RESET + "to return to the Hub."}));
} }
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void HubClockInteract(PlayerInteractEvent event) public void HubClockInteract(PlayerInteractEvent event)
{ {
@ -409,7 +409,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
_portal.SendPlayerToServer(player, "Lobby"); _portal.SendPlayerToServer(player, "Lobby");
} }
public boolean IsAlive(Player player) public boolean IsAlive(Player player)
{ {
if (_game == null) if (_game == null)
@ -417,7 +417,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
return _game.IsAlive(player); return _game.IsAlive(player);
} }
public void Clear(Player player) public void Clear(Player player)
{ {
player.setGameMode(GameMode.SURVIVAL); player.setGameMode(GameMode.SURVIVAL);
@ -433,9 +433,9 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
((CraftPlayer)player).getHandle().m = true; ((CraftPlayer)player).getHandle().m = true;
GetCondition().EndCondition(player, ConditionType.CLOAK, "Spectator"); GetCondition().EndCondition(player, ConditionType.CLOAK, "Spectator");
HubClock(player); HubClock(player);
GetDisguise().undisguise(player); GetDisguise().undisguise(player);
} }
@ -447,17 +447,17 @@ public class ArcadeManager extends MiniPlugin implements IRelation, IChat
ArrayList<String> maps = new ArrayList<String>(); ArrayList<String> maps = new ArrayList<String>();
System.out.println("Searching Maps in: " + folder); System.out.println("Searching Maps in: " + folder);
for (File file : folder.listFiles()) for (File file : folder.listFiles())
{ {
if (!file.isFile()) if (!file.isFile())
continue; continue;
String name = file.getName(); String name = file.getName();
if (name.length() < 5) if (name.length() < 5)
continue; continue;
name = name.substring(name.length()-4, name.length()); name = name.substring(name.length()-4, name.length());
if (file.getName().equals(".zip")) if (file.getName().equals(".zip"))