From 6dfcdce027829769794de976dc4b1078289f510d Mon Sep 17 00:00:00 2001 From: Chiss Date: Sat, 22 Nov 2014 10:29:00 +1100 Subject: [PATCH] increased illusion cooldown cleaned axethrow --- .../game/classcombat/Skill/Knight/AxeThrow.java | 12 ++++++++++++ .../game/classcombat/Skill/SkillFactory.java | 2 +- .../game/games/wither/kit/KitWitherMinion.java | 4 +++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java index 75b6517f7..a8f77fde2 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java @@ -219,6 +219,18 @@ public class AxeThrow extends SkillActive implements IThrown @Override public void Reset(Player player) { + Iterator i = _thrown.keySet().iterator(); + while (i.hasNext()) + { + Item item = i.next(); + Player thrower = _thrown.get(item); + + if (player.equals(thrower)) + { + i.remove(); + item.remove(); + } + } } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java index 8730291dc..4b8b188a9 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java @@ -171,7 +171,7 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory AddSkill(new Illusion(this, "Illusion", ClassType.Assassin, SkillType.Sword, 1, 4, 40, -3, - 12000, -1000, true, + 40000, -3000, true, new Material[] {Material.IRON_SWORD, Material.GOLD_SWORD, Material.DIAMOND_SWORD}, new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK})); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java index 15b19a46b..891929068 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java @@ -54,10 +54,12 @@ public class KitWitherMinion extends Kit // disguise.SetCustomNameVisible(true); // Manager.GetDisguise().disguise(disguise); // } + + @Override public void GiveItems(Player player) - { + { player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte)0, 1, C.cYellow + C.Bold + "Left-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Wither Skull"));