Removed more class files.

Fixed DOM-22, DOM-20, DOM-19, DOM-17, DOM-14, DOM-7, DOM-3, DOM-1

Plugins/BuildFiles/common.xml

@@ -246,8 +246,8 @@
 		<copy file="../bin/Lobby.jar" todir="../../Testing/Lobby/plugins"/>
 	</target>
 	<target name="NautilusCraftBukkit2" description="NautilusCraftBukkit2">
-		<jar jarfile="../bin/craftbukkit-0.0.1-SNAPSHOT.jar">
+		<copy file="../Libraries/craftbukkit.jar" todir="../bin/" overwrite="true"/>
-			<zipfileset src="../Libraries/craftbukkit.jar" excludes="META-INF/*.SF"/>
+		<jar jarfile="../bin/craftbukkit.jar" update="true">
 			<fileset dir="../Nautilus.Core.CraftBukkit/bin">
 				<include name="**/*.class"/>
 			</fileset>

Plugins/Mineplex.Minecraft.Game.ClassCombat/.classpath

@@ -2,11 +2,10 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
-	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/bukkit.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core.CraftBukkit"/>
-	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar" sourcepath="/REPO_DIR/GitHubLibraries/CraftBukkit/src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Minecraft.Game.Core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core"/>
+	<classpathentry kind="var" path="REPO_DIR/Plugins/bin/craftbukkit.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java

@@ -138,7 +138,7 @@ public class MarkedForDeath extends SkillActive
 		}
 		
 		//Vuln
-		Factory.Condition().Factory().Vulnerable(GetName(), damagee, damager, duration, 3, true, true, true);
+		Factory.Condition().Factory().Vulnerable(GetName(), damagee, damager, duration, 1, true, true, true);
 		
 		//Damage
 		event.AddMod(damager.getName(), GetName(), 0, true);

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java

@@ -1,6 +1,5 @@
 package mineplex.minecraft.game.classcombat.Skill.Brute;
 
-import java.util.HashMap;
 import java.util.HashSet;
 
 import org.bukkit.Effect;
@@ -14,12 +13,14 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.vehicle.VehicleExitEvent;
 
 import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 import mineplex.core.common.util.F;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.core.updater.UpdateType;
+import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilAction;
 import mineplex.core.common.util.UtilBlock;
 import mineplex.core.common.util.UtilEnt;
@@ -36,8 +37,8 @@ public class DwarfToss extends SkillActive
 {
 	private long _chargeTime = 4000;
 	private HashSet<Player>	_used = new HashSet<Player>();
-	private HashMap<Player, LivingEntity> _holding = new HashMap<Player, LivingEntity>();
+	private NautHashMap<Player, LivingEntity> _holding = new NautHashMap<Player, LivingEntity>();
-	private HashMap<Player, Long> _charge = new HashMap<Player, Long>();
+	private NautHashMap<Player, Long> _charge = new NautHashMap<Player, Long>();
 	private HashSet<Player> _charged = new HashSet<Player>();
 
 	public DwarfToss(SkillFactory skills, String name, ClassType classType, SkillType skillType, 
@@ -121,6 +122,22 @@ public class DwarfToss extends SkillActive
 		return true;
 	}
 	
+	@EventHandler
+	public void PreventDismount(VehicleExitEvent event)
+	{
+		if (event.isCancelled())
+			return;
+		
+		if (!(event.getExited() instanceof Player))
+			return;
+		
+		if (!(event.getVehicle() instanceof Player))
+			return;
+		
+		if (_holding.containsKey((Player)event.getVehicle()) && _holding.get((Player)event.getVehicle()) == event.getExited())
+			event.setCancelled(true);
+	}
+
 	@EventHandler
 	public void Grab(PlayerInteractEntityEvent event)
 	{
@@ -161,8 +178,8 @@ public class DwarfToss extends SkillActive
 		}	
 
 		//Hold Loop
-		if (_holding.containsKey(target))
+		if (target instanceof Player && _holding.containsKey((Player)target))
-			if (_holding.get(target).equals(player))
+			if (_holding.get((Player)target).equals(player))
 				if (target instanceof Player)
 				{
 					UtilPlayer.message(player, F.main(GetClassType().name(), F.name(((Player)target).getName()) + " is already holding you."));

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java

@@ -153,7 +153,7 @@ public class ArcticArmor extends Skill
 							Factory.BlockRestore().Add(block, 79, (byte)0, (long)(duration * (1 + blocks.get(block))));
 
 				//Snow
-				Factory.BlockRestore().Snow(block, (byte)1, (byte)1, (long)(duration * (1 + blocks.get(block))), 250, 0);
+				Factory.BlockRestore().Snow(block, (byte)0, (byte)0, (long)(duration * (1 + blocks.get(block))), 250, 0);
 			}
 		}
 	}

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Void.java

@@ -73,6 +73,8 @@ public class Void extends Skill
 
 			//Remove Condition
 			Factory.Condition().EndCondition(event.getPlayer(), null, GetName());
+			
+			Factory.Energy().RemoveEnergySwingMod(player, GetName());
 		}
 		else
 		{
@@ -84,6 +86,8 @@ public class Void extends Skill
 			
 			//Remove Condition
 			Factory.Condition().EndCondition(event.getPlayer(), null, GetName());
+			
+			Factory.Energy().AddEnergySwingMod(player, GetName(), -4);
 		} 
 	}
 	

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java

@@ -75,10 +75,9 @@ public class Sharpshooter extends Skill
 			//Damage
 			event.AddMod(player.getName(), GetName(), _hitCount.get(player) * 2, true);
 
-			//Increment
+			int limit = Math.min(3, _hitCount.get(player) + 1);
-			_hitCount.put(player, _hitCount.get(player) + 1);
 
-			int limit = Math.min(3, _hitCount.get(player));
+			_hitCount.put(player, limit);
 			
 			//Inform
 			UtilPlayer.message(projectile.getShooter(), F.main(GetClassType().name(), GetName() + ": " + 
@@ -101,7 +100,7 @@ public class Sharpshooter extends Skill
 		HashSet<Entity> remove = new HashSet<Entity>();
 
 		for (Entity cur : _arrows.keySet())
-			if (cur.isDead() || !cur.isValid())
+			if (cur.isDead() || !cur.isValid() || cur.isOnGround())
 				remove.add(cur);
 
 		for (Entity cur : remove)

Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/Throwable/Web.java

@@ -38,12 +38,16 @@ public class Web extends ItemUsable
 
 	@Override
 	public void Collide(LivingEntity target, Block block, ProjectileUser data) 
+	{
+		if (target != null)
 		{
 			double distance = UtilMath.offset(target.getLocation(), data.GetThrown().getLocation());
+			
 			if (distance > .75)
 			{
 				data.GetThrown().teleport(data.GetThrown().getLocation().add(new Vector(0, -distance / 2, 0)));
 			}
+		}
 		
 		CreateWeb(data.GetThrown());
 	}

Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java

@@ -40,6 +40,7 @@ import mineplex.minecraft.game.core.combat.*;
 import mineplex.minecraft.game.core.damage.DamageManager;
 import mineplex.minecraft.game.core.fire.Fire;
 import mineplex.minecraft.game.core.mechanics.PistonJump;
+import mineplex.minecraft.game.core.mechanics.Weapon;
 import nautilus.game.core.util.NullChunkGenerator;
 
 import org.bukkit.Location;
@@ -118,6 +119,7 @@ public abstract class GamePlugin extends JavaPlugin implements IRelation
         new AntiStack(this);
         new MemoryFix(this);
         new PistonJump(this);
+        new Weapon(this, Energy);
         
         getServer().getScheduler().scheduleSyncRepeatingTask(this, updater, 1, 1);
         

Plugins/Nautilus.Game.Core/src/nautilus/game/core/engine/GameEngine.java

@@ -769,6 +769,7 @@ public abstract class GameEngine<GameType extends IGame<ArenaType, PlayerType>,
         if (event.getResult() != Result.KICK_BANNED && IsPlayerInGame(event.getPlayer()))
         {            
             event.allow();
+            return;
         }
         
         if (ActiveGames.size() > 0 || GamesInSetup.size() > 0)

Plugins/Nautilus.Game.Dominate/src/nautilus/game/dominate/scoreboard/DominateTabScoreboard.java

@@ -36,7 +36,7 @@ public class DominateTabScoreboard extends TabScoreboard<IDominateGame, IDominat
             
             if (controlPoint.Captured() && controlPoint.GetOwnerTeam() == Game.GetRedTeam())
             {
-            	RedColumn.get(lineIndex).SetLine(ChatColor.stripColor(controlPoint.GetName()) + ChatColor.RED);
+            	RedColumn.get(lineIndex).SetLine(ChatColor.stripColor(controlPoint.GetName()));
             	continue;
             }
 
@@ -61,7 +61,7 @@ public class DominateTabScoreboard extends TabScoreboard<IDominateGame, IDominat
             
             if (controlPoint.Captured() && controlPoint.GetOwnerTeam() == Game.GetBlueTeam())
             {
-            	BlueColumn.get(lineIndex).SetLine(ChatColor.stripColor(controlPoint.GetName()) + ChatColor.BLUE);
+            	BlueColumn.get(lineIndex).SetLine(ChatColor.stripColor(controlPoint.GetName()));
             	continue;
             }