From ceccf2d2acd621a675f717f10374b3d6b91433e3 Mon Sep 17 00:00:00 2001
From: TadahTech <tandis96@hotmail.com>
Date: Sat, 23 Jul 2016 22:36:53 -0500
Subject: [PATCH] Don't give the item when a game is in progress.

---
 .../src/mineplex/core/party/PartyEventListener.java        | 2 --
 .../mineplex/core/party/manager/PartyMethodManager.java    | 2 +-
 Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java      | 3 +++
 .../nautilus/game/arcade/managers/GamePlayerManager.java   | 7 ++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyEventListener.java b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyEventListener.java
index b0db2a619..06319bc04 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyEventListener.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyEventListener.java
@@ -36,8 +36,6 @@ public class PartyEventListener implements Listener
 	{
 		Player player = event.getPlayer();
 
-		player.getInventory().setItem(PartyManager.INTERFACE_SLOT, PartyManager.INTERFACE_ITEM);
-
 		String partyName = _plugin.getInviteManager().getPartyWaiting(player.getUniqueId());
 
 		if (partyName == null)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java
index f25d984c9..bc4955d44 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java
@@ -108,7 +108,7 @@ public class PartyMethodManager
 			_plugin.getInviteManager().sendAcceptOrDeny(possible, caller.getName());
 			return;
 		}
-		//Only perform this when I actually need too.
+		//Only perform this when I actually need to.
 		boolean can = Bukkit.getMaxPlayers() >= _plugin.getPlugin().getServer().getOnlinePlayers().size();
 		if(!can)
 		{
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
index da590e9b6..92464dca5 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
@@ -515,6 +515,9 @@ public class HubManager extends MiniClientPlugin<HubClient>
 			//Add Self to Other
 			otherPlayer.getScoreboard().getTeam(rankName).addPlayer(player);
 		}
+
+		//only give it in the hub
+		player.getInventory().setItem(PartyManager.INTERFACE_SLOT, PartyManager.INTERFACE_ITEM);
 	}
 
 	@EventHandler
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
index cef0c62ab..86d41b5be 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
@@ -1,7 +1,5 @@
 package nautilus.game.arcade.managers;
 
-import java.util.ArrayList;
-
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
@@ -9,6 +7,7 @@ import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilPlayer;
 import mineplex.core.common.util.UtilTabTitle;
 import mineplex.core.common.util.UtilTime;
+import mineplex.core.party.PartyManager;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
@@ -23,7 +22,6 @@ import nautilus.game.arcade.game.Game.GameState;
 import nautilus.game.arcade.game.GameTeam;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.ProgressingKit;
-
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -41,6 +39,8 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.util.ArrayList;
+
 public class GamePlayerManager implements Listener
 {
 	ArcadeManager Manager;
@@ -154,6 +154,7 @@ public class GamePlayerManager implements Listener
 					player.sendMessage(F.main("Kit", "No default kit found for " + C.cGreenB + Manager.GetGame().GetName()));
 				}
 			}.runTaskLater(Manager.getPlugin(), 10L);
+			player.getInventory().setItem(PartyManager.INTERFACE_SLOT, PartyManager.INTERFACE_ITEM);
 			return;
 		}