Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java

@@ -238,10 +238,12 @@ public class UtilBlock
 			blockUseSet.add((byte)69);	//Lever
 			blockUseSet.add((byte)71);	//Iron Door
 			blockUseSet.add((byte)77);	//Button
+			blockUseSet.add((byte)85);	//Fence (stupid minecraft)
 			blockUseSet.add((byte)93);	//Repeater
 			blockUseSet.add((byte)94);	//Repeater
 			blockUseSet.add((byte)96);	//Trapdoor
 			blockUseSet.add((byte)107);	//Fence Gate
+			blockUseSet.add((byte)113);	//Nether Fence (stupid minecraft)
 			blockUseSet.add((byte)116);	//Enchantment Table
 			blockUseSet.add((byte)117);	//Brewing Stand
 			blockUseSet.add((byte)130);	//Ender Chest
@@ -249,6 +251,22 @@ public class UtilBlock
 			blockUseSet.add((byte)146);	//Trapped Chest
 			blockUseSet.add((byte)154);	//Hopper
 			blockUseSet.add((byte)158);	//Dropper
+			
+			blockUseSet.add((byte)184);	//Fences/Gates
+			blockUseSet.add((byte)185);	//Fences/Gates
+			blockUseSet.add((byte)186);	//Fences/Gates
+			blockUseSet.add((byte)187);	//Fences/Gates
+			blockUseSet.add((byte)188);	//Fences/Gates
+			blockUseSet.add((byte)189);	//Fences/Gates
+			blockUseSet.add((byte)190);	//Fences/Gates
+			blockUseSet.add((byte)191);	//Fences/Gates
+			blockUseSet.add((byte)192);	//Fences/Gates
+			
+			blockUseSet.add((byte)193);	//Wood Doors
+			blockUseSet.add((byte)194);	//Wood Doors
+			blockUseSet.add((byte)195);	//Wood Doors
+			blockUseSet.add((byte)196);	//Wood Doors
+			blockUseSet.add((byte)197);	//Wood Doors
 		}
 
 		return blockUseSet.contains(block);

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<Item> i = _thrown.keySet().iterator();
 		
+		while (i.hasNext())
+		{
+			Item item = i.next();
+			Player thrower = _thrown.get(item);
+			
+			if (player.equals(thrower))
+			{
+				i.remove();
+				item.remove();
+			}
+		}
 	}
 }

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}));
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java

@@ -55,6 +55,8 @@ public class KitWitherMinion extends Kit
 //		Manager.GetDisguise().disguise(disguise);
 //	}
 	
+	
+
 	@Override
 	public void GiveItems(Player player) 
 	{