projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-13 03:13:26 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Josh-Larson
2014-07-21 18:45:16 -05:00
parent 25a080ad60 04d08dc613
commit 4d8b768cfc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/teleport.py
+2 -2
View File
@@ -23,7 +23,7 @@ def run(core, actor, target, commandString):
if arg1 and arg2 and arg3 and arg4 is not None:
try:
actor.sendSystemMessage('Teleporting...', 0)
actor.sendSystemMessage('gm: teleport: Command completed successfully.', 0)
position = Point3D(float(arg1), float(arg2), float(arg3))
core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetByName(arg4), position, actor.getOrientation(), None)
except:
@@ -33,7 +33,7 @@ def run(core, actor, target, commandString):
elif arg1 and arg2 and arg3:
try:
actor.sendSystemMessage('Teleporting...', 0)
actor.sendSystemMessage('gm: teleport: Command completed successfully.', 0)
position = Point3D(float(arg1), 0, float(arg2))
core.simulationService.transferToPlanet(actor, core.terrainService.getPlanetByName(arg3), position, actor.getOrientation(), None)
except:
scripts/commands/teleporttarget.py
+1 -1
View File
@@ -12,7 +12,7 @@ def run(core, actor, target, commandString):
return
if target and target.getSlottedObject('ghost') is not None:
actor.sendSystemMessage('Teleporting ' + target.getCustomName() + ' to you...', 0)
actor.sendSystemMessage('gm: teleporttarget: Command completed successfully.', 0)
core.simulationService.teleport(target, actor.getPosition(), actor.getOrientation(), 0)
return
scripts/commands/teleportto.py
+1 -1
View File
@@ -15,7 +15,7 @@ def run(core, actor, target, commandString):
target = core.objectService.getObjectByFirstName(commandString)
if target and target.getSlottedObject('ghost') is not None:
actor.sendSystemMessage('Teleporting you to ' + target.getCustomName() + '...', 0)
actor.sendSystemMessage('gm: teleportto: Command completed successfully.', 0)
if target.getPlanetId() == actor.getPlanetId():
core.simulationService.teleport(actor, target.getPosition(), target.getOrientation(), target.getParentId())
else: