From 0b0710458ff164e17cce8fa68bb4c69903490e96 Mon Sep 17 00:00:00 2001
From: Shaun Bennett <phination@me.com>
Date: Fri, 27 Nov 2015 03:22:17 -0500
Subject: [PATCH] Hub updates/try to fix chiss stuff

---
 .../src/mineplex/game/clans/Clans.java        |  2 +-
 .../hub/server/ui/clans/ClansServerPage.java  | 35 +++++++++++--------
 .../hub/server/ui/clans/ClansServerShop.java  |  2 +-
 .../game/games/minestrike/MineStrike.java     |  6 +---
 .../minestrike/items/grenades/Smoke.java      | 12 +++----
 5 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
index 072549742..5f6fd52d2 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
@@ -119,7 +119,7 @@ public class Clans extends JavaPlugin
 		new CustomTagFix(this, packetHandler);
 		GearManager customGear = new GearManager(this, packetHandler, _clientManager, _donationManager);
 
-		HologramManager hologram = new HologramManager(this);
+		HologramManager hologram = new HologramManager(this, packetHandler);
 		_clansManager = new ClansManager(this, serverStatusManager.getCurrentServerName(), packetHandler, _clientManager, _donationManager, preferenceManager, blockRestore, teleport, chat, customGear, hologram, webServerAddress);
 		new Recipes(this);
 		new Farming(this);
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerPage.java
index fee39d92e..87a5a8f35 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerPage.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerPage.java
@@ -32,7 +32,7 @@ public class ClansServerPage extends ShopPageBase<ServerManager, ClansServerShop
 	public ClansServerPage(ServerManager plugin, ClansServerShop shop, CoreClientManager clientManager, 
 							DonationManager donationManager, Player player, ClanRepository repository)
 	{
-		super(plugin, shop, clientManager, donationManager, "Clans", player, 27);
+		super(plugin, shop, clientManager, donationManager, "Clans Alpha", player, 27);
 
 		_repository = repository;
 		_accountId = clientManager.getAccountId(player);
@@ -64,10 +64,10 @@ public class ClansServerPage extends ShopPageBase<ServerManager, ClansServerShop
 	{
 		buildJoinHomeServer(clan);
 		
-		if (isLeader(clan))
-		{
-			buildMoveClan(clan);
-		}
+//		if (isLeader(clan))
+//		{
+//			buildMoveClan(clan);
+//		}
 	}
 	
 	private void buildNoClanPage()
@@ -93,25 +93,29 @@ public class ClansServerPage extends ShopPageBase<ServerManager, ClansServerShop
 		boolean serverOnline = (serverInfo != null);
 		String serverStatus = serverOnline ? C.cGreen + "Online" : C.cRed + "Offline";
 		
-		String title = C.cRed + C.Bold + "Join Home Server!";
-		String description = C.cGold + "Join your home server, " + C.cAqua + clan.getHomeServer() + C.cGold + "!";
-		String serverDesc = C.cGold + "Server Status: " + serverStatus + C.cGold + "!";
-		ShopItem shopItem = new ShopItem(Material.EMERALD_BLOCK, title, new String[] {" ", description, serverDesc, " "}, 0, true, true);
+		String title = (serverOnline ? C.cGreen : C.cRed) + C.Bold + "Join Home Server!";
+//		String description = C.cGold + "Join your home server, " + C.cAqua + clan.getHomeServer() + C.cGold + "!";
+		String serverDesc = C.cYellow + "Server Status " + serverStatus;
+		String players = (serverOnline ? C.cYellow + "Players " + C.cWhite +  serverInfo.CurrentPlayers + "/" + serverInfo.MaxPlayers : "" );
+		String change = C.cWhite + "You must leave your clan to change";
+		String change2 = C.cWhite + "your clans home server!";
+		ShopItem shopItem = new ShopItem(Material.EMERALD_BLOCK, title, new String[] {" ", serverDesc, players, " ", change, change2, " "}, 0, true, true);
 		addButton(13, shopItem, new JoinServerButton(this, getPlugin(), getServerInfo(clan.getHomeServer()), getPlayer()));
 	}
 	
 	private void buildJoinServer(int slot, ServerInfo server)
 	{
-		String title = C.cRed + C.Bold + "Join Clans Server!";
-		String desc1 = C.cGold + "Name: " + C.cAqua + server.Name;
-		String desc2 = C.cGold + "Players: " + C.cAqua + server.CurrentPlayers + "/" + server.MaxPlayers; 
-		String desc3 = C.Bold + C.cRed + "Note: " + ChatColor.RESET + C.cGray + "Creating a clan on this";
-		String desc4 = C.cGray + "server will set your home server!";
+		String title = C.cGreen + C.Bold + "Join Clans Server!";
+		String desc1 = C.cYellow + "Name " + C.cWhite + server.Name;
+		String desc2 = C.cYellow + "Players " + C.cWhite + server.CurrentPlayers + "/" + server.MaxPlayers;
+		String desc3 = C.cWhite + "Creating or Joining a clan on this";
+		String desc4 = C.cWhite + "server will set your home server!";
 
 		ShopItem shopItem = new ShopItem(Material.GOLD_BLOCK, title, new String[] {" ", desc1, desc2, " ", desc3, desc4}, 0, true, true);
 		addButton(slot, shopItem, new JoinServerButton(this, getPlugin(), server, getPlayer()));
 	}
-	
+
+	/*
 	private void buildMoveClan(final SimpleClanToken clan)
 	{
 		// Build button for moving clan to another server
@@ -139,6 +143,7 @@ public class ClansServerPage extends ShopPageBase<ServerManager, ClansServerShop
 		
 		addButton(26, shopItem, button);
 	}
+	*/
 	 
 	private ServerInfo getServerInfo(String serverName)
 	{
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java
index faa191cd7..a3241e2cc 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java
@@ -24,7 +24,7 @@ public class ClansServerShop extends ShopBase<ServerManager>
 	
 	public ClansServerShop(ServerManager plugin, CoreClientManager clientManager, DonationManager donationManager)
 	{
-		super(plugin, clientManager, donationManager, "Clans");
+		super(plugin, clientManager, donationManager, "Clans Alpha");
 
 		_repository = new ClanRepository(plugin.getPlugin(), plugin.getStatusManager().getCurrentServerName());
 	}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
index 166baf04d..1024a5338 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
@@ -2174,16 +2174,12 @@ public class MineStrike extends TeamGame
 
 		//Incendiary
 		_incendiary.clear();
-<<<<<<< HEAD
 		Manager.GetBlockRestore().restoreAll();
-=======
-		Manager.GetBlockRestore().RestoreAll();
-		
+
 		//Smoke
 		for (Block block : _smokeBlocks.keySet())
 			block.setType(Material.AIR);
 		_smokeBlocks.clear();
->>>>>>> master
 
 		//Restock Ammo
 		for (Gun gun : _gunsEquipped.keySet())
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
index a96942805..dbbd4dddb 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
@@ -42,19 +42,15 @@ public class Smoke extends Grenade
 		{
 //			UtilParticle.PlayParticle(ParticleType.HUGE_EXPLOSION, ent.getLocation(), 0.3f, 0.3f, 0.3f, 0, 1,
 //					ViewDist.MAX, UtilServer.getPlayers());
-			
-<<<<<<< HEAD
+
 			UtilParticle.PlayParticle(ParticleType.CLOUD, ent.getLocation(), 1.5f, 1.5f, 1.5f, 0, 100,
 					ViewDist.MAX, UtilServer.getPlayers());
 
-			
+
 			ent.getWorld().playSound(ent.getLocation(), Sound.FIZZ, 0.1f, 0.1f);
-			
-			for (Location loc : game.Manager.GetBlockRestore().restoreBlockAround(Material.FIRE, ent.getLocation(), 5))
-=======
+
 			//Remove Fire
-			for (Location loc : game.Manager.GetBlockRestore().RestoreBlockAround(Material.FIRE, ent.getLocation(), 5))
->>>>>>> master
+			for (Location loc : game.Manager.GetBlockRestore().restoreBlockAround(Material.FIRE, ent.getLocation(), 5))
 			{
 				loc.getWorld().playSound(loc, Sound.FIZZ, 1f, 1f);
 			}