Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java

@@ -276,6 +276,9 @@ public abstract class Game implements Listener
 	{
 		_gameState = state;
 		_gameStateTime = System.currentTimeMillis();
+		
+		for (Player player : UtilServer.getPlayers())
+			player.leaveVehicle();
 
 		//Event
 		GameStateChangeEvent stateEvent = new GameStateChangeEvent(this, state);

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitGolem.java

@@ -30,8 +30,8 @@ public class KitGolem extends SmashKit
 				new PerkSmashStats(7, 1.0, 0.25, 8),
 				new PerkDoubleJump("Double Jump", 0.9, 0.9, false),
 				new PerkSlow(0),
-				new PerkSeismicSlam(),
 				new PerkFissure(),
+				new PerkSeismicSlam(),
 				
 								}, 
 								EntityType.IRON_GOLEM,
@@ -41,7 +41,7 @@ public class KitGolem extends SmashKit
 	@Override
 	public void GiveItems(Player player) 
 	{
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_AXE, (byte)0, 1, 
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SWORD, (byte)0, 1, 
 				C.cYellow + C.Bold + "Right-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Fissure",
 				new String[]
 						{
@@ -53,7 +53,7 @@ public class KitGolem extends SmashKit
 			
 						}));
 		
-		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SPADE, (byte)0, 1, 
+		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_AXE, (byte)0, 1, 
 				C.cYellow + C.Bold + "Right-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Seismic Slam",
 				new String[]
 						{

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitKnight.java

@@ -25,6 +25,7 @@ import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.disguise.disguises.DisguiseSkeleton;
 import mineplex.core.itemstack.ItemStackFactory;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
@@ -75,7 +76,7 @@ public class KitKnight extends SmashKit
 						{
 
 						}));
-		
+
 		player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW, (byte)0, 1, 
 				C.cYellow + C.Bold + "Right-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Coming Soon...",
 				new String[]
@@ -89,6 +90,12 @@ public class KitKnight extends SmashKit
 		player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.IRON_BOOTS));
 
 		//Disguise
+		DisguiseSkeleton disguise = new DisguiseSkeleton(player);
+		disguise.SetName(C.cYellow + player.getName());
+		disguise.SetCustomNameVisible(true);
+		Manager.GetDisguise().disguise(disguise);
+
+		//Horse
 		Manager.GetGame().CreatureAllowOverride = true;
 		final Horse horse = player.getWorld().spawn(player.getLocation(), Horse.class);
 		Manager.GetGame().CreatureAllowOverride = false;
@@ -175,7 +182,7 @@ public class KitKnight extends SmashKit
 
 		if (!(damagee.getVehicle() instanceof Horse))
 			return;
-		
+
 		if (event.GetCause() == DamageCause.SUFFOCATION)
 		{
 			event.SetCancelled("Horse Suffocation");
@@ -226,7 +233,7 @@ public class KitKnight extends SmashKit
 		//Add Knockback
 		event.AddKnockback("Knockback Multiplier", 1.2);
 	}
-
+	
 	@Override
 	public Entity SpawnEntity(Location loc)
 	{

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java

@@ -38,7 +38,7 @@ public class KitSkeleton extends SmashKit
 				new PerkFletcher(1, 2, false),	
 				new PerkKnockbackArrow(2),	
 				new PerkBoneExplosion(),
-				new PerkRopedArrow("Roped Arrow", 1, 2500),
+				new PerkRopedArrow("Roped Arrow", 1, 2000),
 				new PerkBarrage(5, 250, true),
 								}, 
 								EntityType.SKELETON,

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFissure.java

@@ -45,7 +45,7 @@ public class PerkFissure extends Perk
 		if (event.getPlayer().getItemInHand() == null)
 			return;
 
-		if (!event.getPlayer().getItemInHand().getType().toString().contains("_AXE"))
+		if (!event.getPlayer().getItemInHand().getType().toString().contains("_SPADE"))
 			return;
 
 		Player player = event.getPlayer();

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkNeedler.java

@@ -56,7 +56,7 @@ public class PerkNeedler extends Perk
 		if (!Kit.HasKit(player))
 			return;
 
-		if (!Recharge.Instance.use(player, GetName(), 2000, true))
+		if (!Recharge.Instance.use(player, GetName(), 1800, true))
 			return;
 
 		_active.put(player, 7);

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkRopedArrow.java

@@ -70,14 +70,6 @@ public class PerkRopedArrow extends Perk
 		arrow.setVelocity(player.getLocation().getDirection().multiply(2.4 * _power));
 		_arrows.add(arrow);
 
-
-		//Leash
-		//Bat bat = player.getWorld().spawn(player.getEyeLocation(), Bat.class);
-		//bat.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, 100000, 100000));
-		//bat.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 100000, 100000));
-		
-		//bat.setLeashHolder(arrow);
-
 		//Inform
 		UtilPlayer.message(player, F.main("Game", "You fired " + F.skill(_name) + "."));	
 	}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicSlam.java

@@ -54,7 +54,7 @@ public class PerkSeismicSlam extends Perk
 		if (event.getPlayer().getItemInHand() == null)
 			return;
 
-		if (!event.getPlayer().getItemInHand().getType().toString().contains("_SPADE"))
+		if (!event.getPlayer().getItemInHand().getType().toString().contains("_AXE"))
 			return;
 
 		Player player = event.getPlayer();