- Weapons, armor and clothing are now correctly equipped again
serverside.
This also re-ensures armor buffs etc
- Vehicles spawn correctly again
This commit is contained in:
CharonInferar
2014-06-30 00:15:43 +02:00
parent bd91f7435a
commit 5e94fd024c
5 changed files with 22 additions and 8 deletions
+6
View File
@@ -39,6 +39,12 @@ def run(core, actor, target, commandString):
if object != None:
actor.transferTo(actor, oldContainer, object)
if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'):
core.equipmentService.equip(actor, target)
for object in replacedObjects:
core.equipmentService.unequip(actor, object)
oldContainer.transferTo(actor, container, target)
+7 -1
View File
@@ -78,7 +78,13 @@ def run(core, actor, target, commandString):
replacedObjects.append(object)
if object != None:
container.transferTo(actor, container, object)
container.transferTo(actor, container, object)
if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'):
core.equipmentService.equip(actor, target)
for object in replacedObjects:
core.equipmentService.unequip(actor, object) # Needs to be verified due to the new structure of the script
oldContainer.transferTo(actor, container, target)
+7 -1
View File
@@ -39,7 +39,13 @@ def run(core, actor, target, commandString):
if object != None:
container.transferTo(actor, container, object)
if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'):
core.equipmentService.equip(actor, target)
for object in replacedObjects:
core.equipmentService.unequip(actor, object)
oldContainer.transferTo(actor, container, target)
return