Fix disableCustom not firing properly

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/balloons/BabyCowBalloon.java

@@ -41,7 +41,7 @@ public class BabyCowBalloon extends BalloonGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		_entityStand.remove();
 		_balloonEntity.remove();

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java

@@ -47,9 +47,9 @@ public class ItemBatGun extends ItemGadget
 	}
 	
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
-		super.disableCustom(player);
+		super.disableCustom(player, message);
 		
 		Clear(player);
 	}

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemEtherealPearl.java

@@ -42,9 +42,9 @@ public class ItemEtherealPearl extends ItemGadget
 	}
 	
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
-		super.disableCustom(player);
+		super.disableCustom(player, message);
 	}
 
 	@Override

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPaintbrush.java

@@ -89,13 +89,13 @@ public class ItemPaintbrush extends ItemGadget
 	
 	
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		_brushColor.remove(player.getName());
 		_brushPrevious.remove(player.getName());
 		_playerLocation.remove(player.getName());
 		
-		RemoveItem(player);
+		RemoveItem(player, message);
 	}
 	
 	@EventHandler

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBat.java

@@ -65,7 +65,7 @@ public class MorphBat extends MorphGadget implements IThrown
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBlaze.java

@@ -48,7 +48,7 @@ public class MorphBlaze extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBlock.java

@@ -54,7 +54,7 @@ public class MorphBlock extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java

@@ -79,7 +79,7 @@ public class MorphBunny extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		_jumpCharge.remove(player);
 		this.RemoveArmor(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChicken.java

@@ -54,7 +54,7 @@ public class MorphChicken extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCow.java

@@ -42,7 +42,7 @@ public class MorphCow extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCreeper.java

@@ -56,7 +56,7 @@ public class MorphCreeper extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphEnderman.java

@@ -53,7 +53,7 @@ public class MorphEnderman extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPig.java

@@ -55,7 +55,7 @@ public class MorphPig extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java

@@ -1,6 +1,5 @@
 package mineplex.core.gadget.gadgets.morph;
 
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Skeleton.SkeletonType;
@@ -47,7 +46,7 @@ public class MorphPumpkinKing extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java

@@ -65,7 +65,7 @@ public class MorphSlime extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java

@@ -66,7 +66,7 @@ public class MorphSnowman extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java

@@ -70,7 +70,7 @@ public class MorphTitan extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphUncleSam.java

@@ -46,7 +46,7 @@ public class MorphUncleSam extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java

@@ -64,7 +64,7 @@ public class MorphVillager extends MorphGadget implements IThrown
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java

@@ -73,7 +73,7 @@ public class MorphWither extends MorphGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		this.RemoveArmor(player);
 		Manager.getDisguiseManager().undisguise(player);
@@ -200,7 +200,7 @@ public class MorphWither extends MorphGadget
 			
 			if (disguise == null || !(disguise instanceof DisguiseWither))
 			{
-				disableCustom(player);
+				disableCustom(player, true);
 				activeIterator.remove();
 				continue;
 			}

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/OutfitTeam.java

@@ -77,7 +77,7 @@ public class OutfitTeam extends OutfitGadget
 	}
 	
 	@Override
-	public void removeArmor(Player player)
+	public void removeArmor(Player player, boolean message)
 	{
 		if (!_active.remove(player))
 			return;
@@ -96,9 +96,9 @@ public class OutfitTeam extends OutfitGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
-		removeArmor(player);
+		removeArmor(player, message);
 	}
 
 	@EventHandler(priority=EventPriority.LOWEST)

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/ravesuit/OutfitRaveSuit.java

@@ -43,9 +43,9 @@ public class OutfitRaveSuit extends OutfitGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
-		removeArmor(player);
+		removeArmor(player, message);
 		_colorPhase.remove(player.getName());
 	}
 

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/spacesuit/OutfitSpaceSuit.java

@@ -32,9 +32,9 @@ public class OutfitSpaceSuit extends OutfitGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
-		removeArmor(player);
+		removeArmor(player, message);
 	}
 	
 	@EventHandler

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/windupsuit/OutfitWindUpSuit.java

@@ -41,9 +41,9 @@ public class OutfitWindUpSuit extends OutfitGadget
     }
 
     @Override
-    public void disableCustom(Player player)
+    public void disableCustom(Player player, boolean message)
     {
-        removeArmor(player);
+        removeArmor(player, message);
         _colorPhase.remove(player);
         _percentage.remove(player);
 

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFairy.java

@@ -36,7 +36,7 @@ public class ParticleFairy extends ParticleGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		if (_active.remove(player)) UtilPlayer.message(player, F.main("Gadget", "You unsummoned " + F.elem(getName()) + "."));
 

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleKronos.java

@@ -61,7 +61,7 @@ public class ParticleKronos extends ParticleGadget
 	}
 	
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		if (_active.remove(player))
 			UtilPlayer.message(player, F.main("Gadget", "You unsummoned " + F.elem(getName()) + "."));

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java

@@ -46,7 +46,7 @@ public class ParticleHeart extends ParticleGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		if (_active.remove(player)) UtilPlayer.message(player, F.main("Gadget", "You unsummoned " + F.elem(getName()) + "."));
 	}

Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java

@@ -146,11 +146,6 @@ public abstract class Gadget extends SalesPackageBase implements Listener
 			UtilPlayer.message(player, F.main("Gadget", "You enabled " + F.elem(getName()) + "."));
 	}
 
-	public void disableCustom(Player player)
-	{
-		disableCustom(player, true);
-	}
-
 	public void disableCustom(Player player, boolean message)
 	{
 		if (_active.remove(player) && message)

Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java

@@ -59,11 +59,12 @@ public abstract class HatGadget extends OutfitGadget
 		player.getInventory().setHelmet(getHelmetItem());
 	}
 	
-	public void removeArmor(Player player)
+	public void removeArmor(Player player, boolean message)
 	{
 		if (!_active.remove(player))
 			return;
 
+		if (message)
 			UtilPlayer.message(player, F.main("Gadget", "You took off " + F.elem(getName()) + "."));
 		
 		player.getInventory().setHelmet(null);
@@ -96,9 +97,9 @@ public abstract class HatGadget extends OutfitGadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
-		removeArmor(player);
+		removeArmor(player, message);
 	}
 	
 	public HatType getHatType()

Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java

@@ -56,9 +56,9 @@ public abstract class ItemGadget extends Gadget
 	}
 
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
-		RemoveItem(player);
+		RemoveItem(player, message);
 	}
 
 	public HashSet<Player> getActive()
@@ -113,12 +113,13 @@ public abstract class ItemGadget extends Gadget
 		}
 	}
 
-	public void RemoveItem(Player player)
+	public void RemoveItem(Player player, boolean message)
 	{
 		if (_active.remove(player))
 		{
 			player.getInventory().setItem(Manager.getActiveItemSlot(), null);
 
+			if (message)
 				UtilPlayer.message(player, F.main("Gadget", "You unequipped " + F.elem(getName()) + "."));
 		}
 	}

Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java

@@ -68,11 +68,12 @@ public abstract class OutfitGadget extends Gadget
 				ItemStackFactory.Instance.CreateStack(getDisplayMaterial().getId(), getDisplayData(), 1, getName()));
 	}
 	
-	public void removeArmor(Player player)
+	public void removeArmor(Player player, boolean message)
 	{
 		if (!_active.remove(player))
 			return;
 
+		if (message)
 			UtilPlayer.message(player, F.main("Gadget", "You took off " + F.elem(getName()) + "."));
 		
 		if (_slot == ArmorSlot.Helmet)		player.getInventory().setHelmet(null);

Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ParticleGadget.java

@@ -41,7 +41,7 @@ public abstract class ParticleGadget extends Gadget
 	}
 	
 	@Override
-	public void disableCustom(Player player)
+	public void disableCustom(Player player, boolean message)
 	{
 		if (_active.remove(player))
 		{