Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/resources/objects/tangible/TangibleObject.java

scripts/commands/transferitemarmor.py

@@ -4,17 +4,18 @@ def setup():
 	return
 	
 def run(core, actor, target, commandString):
-	canEquip = core.equipmentService.canEquip(actor, target)
-		
-	if canEquip[0] is False:
-		actor.sendSystemMessage(canEquip[1], 0)
-		return
-		
 
 	parsedMsg = commandString.split(' ', 3)
 	objService = core.objectService
 	containerID = long(parsedMsg[1])
 	container = objService.getObject(containerID)
+	
+	canEquip = core.equipmentService.canEquip(actor, target)
+		
+	if canEquip[0] is False and container == actor:
+		actor.sendSystemMessage(canEquip[1], 0)
+		return
+	
 	if target and container and target.getContainer():
 		oldContainer = target.getContainer()
 		if container == oldContainer:

scripts/commands/transferitemmisc.py

@@ -45,7 +45,7 @@ def run(core, actor, target, commandString):
 
         canEquip = core.equipmentService.canEquip(actor, target)
 		
-        if canEquip[0] is False:
+        if canEquip[0] is False and container == actor:
             actor.sendSystemMessage(canEquip[1], 0)
             return
 			

scripts/commands/transferitemweapon.py

@@ -4,11 +4,7 @@ def setup():
 	return
 	
 def run(core, actor, target, commandString):
-	canEquip = core.equipmentService.canEquip(actor, target)
-		
-	if canEquip[0] is False:
-		actor.sendSystemMessage(canEquip[1], 0)
-		return
+	
 		
 
 	parsedMsg = commandString.split(' ', 3)
@@ -21,6 +17,12 @@ def run(core, actor, target, commandString):
                         print 'Error: New container is same as old container.'
                         return;
 
+		canEquip = core.equipmentService.canEquip(actor, target)
+		
+		if canEquip[0] is False and container == actor:
+			actor.sendSystemMessage(canEquip[1], 0)
+			return
+
 		replacedObject = None
 		slotName = None
 		replacedObjects = []