Index: core3/trunk/MMOCoreORB/src/server/zone/objects/creature/commands/SaberThrow1Command.h
===================================================================
diff -u -N -r3293 -r4647
--- core3/trunk/MMOCoreORB/src/server/zone/objects/creature/commands/SaberThrow1Command.h	(.../SaberThrow1Command.h)	(revision 3293)
+++ core3/trunk/MMOCoreORB/src/server/zone/objects/creature/commands/SaberThrow1Command.h	(.../SaberThrow1Command.h)	(revision 4647)
@@ -46,12 +46,13 @@
 #define SABERTHROW1COMMAND_H_
 
 #include "server/zone/objects/scene/SceneObject.h"
+#include "CombatQueueCommand.h"
 
-class SaberThrow1Command : public QueueCommand {
+class SaberThrow1Command : public CombatQueueCommand {
 public:
 
 	SaberThrow1Command(const String& name, ZoneProcessServer* server)
-		: QueueCommand(name, server) {
+		: CombatQueueCommand(name, server) {
 
 	}
 
@@ -63,7 +64,17 @@
 		if (!checkInvalidLocomotions(creature))
 			return INVALIDLOCOMOTION;
 
-		return SUCCESS;
+		if (isWearingArmor(creature)) {
+			return NOJEDIARMOR;
+		}
+
+		ManagedReference<WeaponObject*> weapon = creature->getWeapon();
+
+		if (!weapon->isJediWeapon()) {
+			return INVALIDWEAPON;
+		}
+
+		return doCombatAction(creature, target);
 	}
 
 };