diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/MountManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/MountManager.java index 5e1e85ee6..8ff72dd00 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/MountManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/MountManager.java @@ -334,4 +334,10 @@ public class MountManager extends MiniPlugin if (event.getEntity().getItemStack().getType() == Material.LEASH) event.setCancelled(true); } + + @EventHandler + public void HangingBreakEvent(org.bukkit.event.hanging.HangingBreakEvent event) + { + event.setCancelled(true); + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java index ba3c61645..21d398b33 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java @@ -10,6 +10,7 @@ import mineplex.core.common.util.C; import mineplex.core.disguise.disguises.DisguiseChicken; import mineplex.core.itemstack.ItemStackFactory; import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.SmashKit; @@ -34,7 +35,7 @@ public class KitChicken extends SmashKit new PerkFlap(0.8, 0.8, false), new PerkEggGun(), new PerkChickenRocket() - + }, EntityType.CHICKEN, new ItemStack(Material.EGG)); @@ -52,7 +53,7 @@ public class KitChicken extends SmashKit ChatColor.RESET + "They won't deal any knockback, but if", ChatColor.RESET + "they they can deal some serious damage.", })); - + 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 + "Chicken Missile", new String[] @@ -62,20 +63,21 @@ public class KitChicken extends SmashKit ChatColor.RESET + "collides with anything, giving large", ChatColor.RESET + "damage and knockback to players.", })); - - player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.FEATHER, (byte)0, 1, - C.cYellow + C.Bold + "Passive" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Flap", - new String[] - { - ChatColor.RESET + "You are able to use your double jump", - ChatColor.RESET + "up to 6 times in a row. However, with", - ChatColor.RESET + "each flap, it loses some potency.", - ChatColor.RESET + "", - ChatColor.RESET + C.cAqua + "Flap uses Energy (Experience Bar)", - })); + + if (Manager.GetGame().GetState() == GameState.Recruit) + player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.FEATHER, (byte)0, 1, + C.cYellow + C.Bold + "Passive" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Flap", + new String[] + { + ChatColor.RESET + "You are able to use your double jump", + ChatColor.RESET + "up to 6 times in a row. However, with", + ChatColor.RESET + "each flap, it loses some potency.", + ChatColor.RESET + "", + ChatColor.RESET + C.cAqua + "Flap uses Energy (Experience Bar)", + })); player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.LEATHER_CHESTPLATE)); - + //Disguise DisguiseChicken disguise = new DisguiseChicken(player); disguise.SetName(C.cYellow + player.getName()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitCreeper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitCreeper.java index 15cb35bee..4319b8a2a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitCreeper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitCreeper.java @@ -10,6 +10,7 @@ import mineplex.core.common.util.C; import mineplex.core.disguise.disguises.DisguiseCreeper; import mineplex.core.itemstack.ItemStackFactory; import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.SmashKit; @@ -51,9 +52,9 @@ public class KitCreeper extends SmashKit ChatColor.RESET + "Throw a small bomb of sulphur.", ChatColor.RESET + "Explodes on contact with players,", ChatColor.RESET + "dealing some damage and knockback.", - + })); - + player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SPADE, (byte)0, 1, C.cYellow + C.Bold + "Right-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Explosive Leap", new String[] @@ -63,32 +64,32 @@ public class KitCreeper extends SmashKit ChatColor.RESET + "You are sent flying in the direction", ChatColor.RESET + "you are looking, while opponents take", ChatColor.RESET + "large damage and knockback.", - + })); - - player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.NETHER_STAR, (byte)0, 1, - C.cYellow + C.Bold + "Passive" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Lightning Shield", - new String[] - { - ChatColor.RESET + "When attacked by a non-melee attack,", - ChatColor.RESET + "you gain Lightning Shield for 3 seconds.", - ChatColor.RESET + "", - ChatColor.RESET + "Lightning Shield blocks 1 melee attack,", - ChatColor.RESET + "striking lightning on the attacker.", - })); - + if (Manager.GetGame().GetState() == GameState.Recruit) + player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.NETHER_STAR, (byte)0, 1, + C.cYellow + C.Bold + "Passive" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Lightning Shield", + new String[] + { + ChatColor.RESET + "When attacked by a non-melee attack,", + ChatColor.RESET + "you gain Lightning Shield for 3 seconds.", + ChatColor.RESET + "", + ChatColor.RESET + "Lightning Shield blocks 1 melee attack,", + ChatColor.RESET + "striking lightning on the attacker.", + })); + player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.LEATHER_HELMET)); player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.LEATHER_CHESTPLATE)); player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.LEATHER_LEGGINGS)); player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.LEATHER_BOOTS)); - + //Disguise DisguiseCreeper disguise = new DisguiseCreeper(player); disguise.SetName(C.cYellow + player.getName()); disguise.SetCustomNameVisible(true); Manager.GetDisguise().disguise(disguise); } - + @Override public int GetCost() { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java index 33e3497df..8e585ea23 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java @@ -10,6 +10,7 @@ import mineplex.core.common.util.C; import mineplex.core.disguise.disguises.DisguiseSkeleton; import mineplex.core.itemstack.ItemStackFactory; import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.SmashKit; @@ -44,7 +45,7 @@ public class KitSkeleton extends SmashKit EntityType.SKELETON, new ItemStack(Material.BOW)); } - + @Override public void GiveItems(Player player) { @@ -55,7 +56,7 @@ public class KitSkeleton extends SmashKit ChatColor.RESET + "Releases an explosion of bones from", ChatColor.RESET + "your body, repelling all nearby enemies.", })); - + player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW, (byte)0, 1, C.cYellow + C.Bold + "Left-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Roped Arrow", new String[] @@ -64,21 +65,22 @@ public class KitSkeleton extends SmashKit ChatColor.RESET + "collides with something, you are pulled", ChatColor.RESET + "towards it, with great power.", })); - - player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BONE, (byte)0, 1, - C.cYellow + C.Bold + "Charge Bow" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Barrage", - new String[] - { - ChatColor.RESET + "Slowly load more arrows into your bow.", - ChatColor.RESET + "When you release, you will quickly fire", - ChatColor.RESET + "all the arrows in succession.", - })); + + if (Manager.GetGame().GetState() == GameState.Recruit) + player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BONE, (byte)0, 1, + C.cYellow + C.Bold + "Charge Bow" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Barrage", + new String[] + { + ChatColor.RESET + "Slowly load more arrows into your bow.", + ChatColor.RESET + "When you release, you will quickly fire", + ChatColor.RESET + "all the arrows in succession.", + })); player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_HELMET)); player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE)); player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_LEGGINGS)); player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_BOOTS)); - + //Disguise DisguiseSkeleton disguise = new DisguiseSkeleton(player); disguise.SetName(C.cYellow + player.getName()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java index baac60dd6..e39b8adb9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java @@ -10,6 +10,7 @@ import mineplex.core.common.util.C; import mineplex.core.disguise.disguises.DisguiseSnowman; import mineplex.core.itemstack.ItemStackFactory; import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.SmashKit; @@ -56,7 +57,7 @@ public class KitSnowman extends SmashKit ChatColor.RESET + "", ChatColor.RESET + C.cAqua + "Blizzard uses Energy (Experience Bar)", })); - + 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 + "Ice Path", new String[] @@ -64,30 +65,31 @@ public class KitSnowman extends SmashKit ChatColor.RESET + "Create a temporary icy path in the", ChatColor.RESET + "direction you are looking.", })); - - player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.SNOW_BLOCK, (byte)0, 1, - C.cYellow + C.Bold + "Passive" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Arctic Aura", - new String[] - { - ChatColor.RESET + "Creates a field of snow around you", - ChatColor.RESET + "granting 150% damage to opponents", - ChatColor.RESET + "who are standing on it.", - ChatColor.RESET + "", - ChatColor.RESET + "Your aura shrinks on low energy.", - })); + + if (Manager.GetGame().GetState() == GameState.Recruit) + player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.SNOW_BLOCK, (byte)0, 1, + C.cYellow + C.Bold + "Passive" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Arctic Aura", + new String[] + { + ChatColor.RESET + "Creates a field of snow around you", + ChatColor.RESET + "granting 150% damage to opponents", + ChatColor.RESET + "who are standing on it.", + ChatColor.RESET + "", + ChatColor.RESET + "Your aura shrinks on low energy.", + })); player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_HELMET)); player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE)); player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_LEGGINGS)); player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_BOOTS)); - + //Disguise DisguiseSnowman disguise = new DisguiseSnowman(player); disguise.SetName(C.cYellow + player.getName()); disguise.SetCustomNameVisible(true); Manager.GetDisguise().disguise(disguise); } - + @Override public int GetCost() { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java index 768f7ea13..78dfbd5f2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java @@ -10,6 +10,7 @@ import mineplex.core.common.util.C; import mineplex.core.disguise.disguises.DisguiseSpider; import mineplex.core.itemstack.ItemStackFactory; import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.SmashKit; @@ -50,7 +51,7 @@ public class KitSpider extends SmashKit ChatColor.RESET + "your mouth, dealing damage and small", ChatColor.RESET + "knockback to opponents.", })); - + 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 + "Web Shot", new String[] @@ -59,41 +60,43 @@ public class KitSpider extends SmashKit ChatColor.RESET + "it creates a temporary web that traps.", ChatColor.RESET + "opponents.", })); - - player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.SPIDER_EYE, (byte)0, 1, - C.cYellow + C.Bold + "Double Jump" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Spider Leap", - new String[] - { - ChatColor.RESET + "Your double jump is special. It goes", - ChatColor.RESET + "exactly in the direction you are looking.", - ChatColor.RESET + "", - ChatColor.RESET + C.cAqua + "Spider Leap uses Energy (Experience Bar)", - })); - - player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.FERMENTED_SPIDER_EYE, (byte)0, 1, - C.cYellow + C.Bold + "Crouch" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Wall Grab", - new String[] - { - ChatColor.RESET + "While crouching, you stick to walls.", - ChatColor.RESET + "", - ChatColor.RESET + "Grasping onto a wall allows you to", - ChatColor.RESET + "use Spider Leap again.", - ChatColor.RESET + "", - ChatColor.RESET + C.cAqua + "Wall Grab uses Energy (Experience Bar)", - })); + + if (Manager.GetGame().GetState() == GameState.Recruit) + player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.SPIDER_EYE, (byte)0, 1, + C.cYellow + C.Bold + "Double Jump" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Spider Leap", + new String[] + { + ChatColor.RESET + "Your double jump is special. It goes", + ChatColor.RESET + "exactly in the direction you are looking.", + ChatColor.RESET + "", + ChatColor.RESET + C.cAqua + "Spider Leap uses Energy (Experience Bar)", + })); + + if (Manager.GetGame().GetState() == GameState.Recruit) + player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.FERMENTED_SPIDER_EYE, (byte)0, 1, + C.cYellow + C.Bold + "Crouch" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Wall Grab", + new String[] + { + ChatColor.RESET + "While crouching, you stick to walls.", + ChatColor.RESET + "", + ChatColor.RESET + "Grasping onto a wall allows you to", + ChatColor.RESET + "use Spider Leap again.", + ChatColor.RESET + "", + ChatColor.RESET + C.cAqua + "Wall Grab uses Energy (Experience Bar)", + })); player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(Material.LEATHER_HELMET)); player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE)); player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_LEGGINGS)); player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_BOOTS)); - + //Disguise DisguiseSpider disguise = new DisguiseSpider(player); disguise.SetName(C.cYellow + player.getName()); disguise.SetCustomNameVisible(true); Manager.GetDisguise().disguise(disguise); } - + @Override public int GetCost() {