From 38a13d01f15b6170509b3d70bcbaa0df56c4f1fc Mon Sep 17 00:00:00 2001
From: TadahTech <tandis96@hotmail.com>
Date: Wed, 22 Jun 2016 00:56:44 -0500
Subject: [PATCH] Open server menu properly

---
 .../party/event/PartySelectServerEvent.java   | 11 +++++----
 .../tools/owner/SelectServerButton.java       |  2 +-
 .../src/mineplex/hub/HubManager.java          | 24 +++++++++----------
 .../mineplex/hub/server/ServerManager.java    |  9 ++++++-
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartySelectServerEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartySelectServerEvent.java
index a937443c0..c7f97a05c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartySelectServerEvent.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartySelectServerEvent.java
@@ -1,6 +1,7 @@
 package mineplex.core.party.event;
 
 import mineplex.core.party.Party;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
@@ -11,16 +12,16 @@ public class PartySelectServerEvent extends Event
 {
 	private static final HandlerList HANDLER_LIST = new HandlerList();
 
-	private final Party _party;
+	private final Player _player;
 
-	public PartySelectServerEvent(Party party)
+	public PartySelectServerEvent(Player player)
 	{
-		_party = party;
+		_player = player;
 	}
 
-	public Party getParty()
+	public Player getPLayer()
 	{
-		return _party;
+		return _player;
 	}
 
 	@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/SelectServerButton.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/SelectServerButton.java
index cee97b248..6c400a101 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/SelectServerButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/SelectServerButton.java
@@ -32,6 +32,6 @@ public class SelectServerButton extends PartyButton
 	@Override
 	public void onClick(Player player, ClickType clickType)
 	{
-		UtilServer.getPluginManager().callEvent(new PartySelectServerEvent(getParty()));
+		UtilServer.getPluginManager().callEvent(new PartySelectServerEvent(player));
 	}
 }
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
index 18802fd55..2512c393e 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
@@ -604,7 +604,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
 
 		Rank rank = GetClients().Get(player).GetRank();
 
-		if (GetClients().Get(player).isDisguised())
+		if(GetClients().Get(player).isDisguised())
 			rank = GetClients().Get(player).getDisguisedRank();
 
 		//Level Prefix
@@ -612,12 +612,12 @@ public class HubManager extends MiniClientPlugin<HubClient>
 
 		//Rank Prefix
 		String rankStr = "";
-		if (rank != Rank.ALL)
+		if  (rank != Rank.ALL)
 			rankStr = rank.getTag(true, true) + " ";
-		//Party Chat
+/*		//Party Chat
 		if (event.getMessage().charAt(0) == '#')
 		{
-			Party party = _partyManager.getParty(player);
+			Party party = _partyManager.GetParty(player);
 			if (party != null)
 			{
 				event.getRecipients().clear();
@@ -625,23 +625,24 @@ public class HubManager extends MiniClientPlugin<HubClient>
 				event.setMessage(event.getMessage().substring(1, event.getMessage().length()));
 				event.setFormat(levelStr + C.cDPurple + C.Bold + "Party " + C.cWhite + C.Bold + playerName + " " + C.cPurple + "%2$s");
 
-				for (String name : party.getMembers())
+				for (String name : party.GetPlayers())
 				{
 					Player other = UtilPlayer.searchExact(name);
 
 					if (other != null)
-					{
 						event.getRecipients().add(other);
-					}
 				}
-			} else
+			}
+			else
 			{
 				UtilPlayer.message(player, F.main("Party", "You are not in a Party."));
 				event.setCancelled(true);
 			}
 
-		} else
-		{
+			return;
+		}
+		else
+		{*/
 			TextComponent rankComponent = new TextComponent(rankStr);
 			TextComponent playerNameText = new TextComponent(ChatColor.YELLOW + playerName);
 			TextComponent component = new TextComponent();
@@ -661,12 +662,11 @@ public class HubManager extends MiniClientPlugin<HubClient>
 					continue;
 				}
 
-				if (!event.isCancelled())
+				if(!event.isCancelled())
 					other.spigot().sendMessage(component);
 			}
 			event.setCancelled(true);
 //		}
-		}
 	}
 
 	@EventHandler
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
index dfa790891..17770d91c 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
@@ -13,6 +13,7 @@ import java.util.Set;
 
 import mineplex.core.boosters.BoosterManager;
 import mineplex.core.brawl.fountain.BrawlShopProvider;
+import mineplex.core.party.event.PartySelectServerEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -352,7 +353,13 @@ public class ServerManager extends MiniDbClientPlugin<SimpleClanToken> implement
 	{
 		return _serverInfoMap.get(serverName);
 	}
-	
+
+	@EventHandler
+	public void onClickCompassPartyIcon(PartySelectServerEvent event)
+	{
+		_quickShop.attemptShopOpen(event.getPlayer());
+	}
+
 	@EventHandler
 	public void updatePages(UpdateEvent event)
 	{