From 7bb65bb0bf7f12ec73761b39a8492523e36f61d2 Mon Sep 17 00:00:00 2001
From: Light2 <light_pswg@yahoo.com>
Date: Sun, 30 Mar 2014 21:02:45 +0200
Subject: [PATCH] Added /teleporttarget GM command

---
 scripts/commands/teleporttarget.py  | 29 +++++++++++++++++++++++++++++
 src/services/SimulationService.java |  7 ++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 scripts/commands/teleporttarget.py

diff --git a/scripts/commands/teleporttarget.py b/scripts/commands/teleporttarget.py
new file mode 100644
index 00000000..f497fe25
--- /dev/null
+++ b/scripts/commands/teleporttarget.py
@@ -0,0 +1,29 @@
+import sys
+from engine.resources.scene import Point3D
+
+def setup():
+    return
+    
+def run(core, actor, target, commandString):
+	
+	playerObject = actor.getSlottedObject('ghost')
+
+	if not playerObject:
+		return
+	
+	commandArgs = commandString.split(' ')
+	if len(commandArgs) > 0:
+		arg1 = commandArgs[0]
+	if len(commandArgs) > 1:
+		arg2 = commandArgs[1]
+	if len(commandArgs) > 2:
+		arg3 = commandArgs[2]
+	if len(commandArgs) > 3:
+		arg4 = commandArgs[3]
+	
+	if arg1 and arg2 and arg3 and arg4 target:
+		position = Point3D(float(arg2), float(arg3), float(arg4))
+		core.simulationService.transferToPlanet(target, core.terrainService.getPlanetByName(arg1), position, actor.getOrientation(), None)
+
+	
+	return
diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
index 0c9f5f6e..80680ae1 100644
--- a/src/services/SimulationService.java
+++ b/src/services/SimulationService.java
@@ -167,6 +167,7 @@ public class SimulationService implements INetworkDispatch {
 		core.commandService.registerCommand("requestbiography");
 		core.commandService.registerCommand("eject");
 		core.commandService.registerGmCommand("broadcast");
+		core.commandService.registerGmCommand("teleporttarget");
 
 	}
 	
@@ -958,7 +959,7 @@ public class SimulationService implements INetworkDispatch {
 			for(Mesh3DTriangle tri : tris) {
 				
 				if(ray.intersectsTriangle(tri, distance) != null) {
-					System.out.println("Collision took: " + (System.nanoTime() - startTime) + " ns (collided)");
+					//System.out.println("Collision took: " + (System.nanoTime() - startTime) + " ns (collided)");
 				//	System.out.println("Collided with " + object.getTemplate() + " X: " + object.getPosition().x + " Y: " + object.getPosition().y + " Z: " + object.getPosition().z);	
 					return false;
 				}
@@ -990,11 +991,11 @@ public class SimulationService implements INetworkDispatch {
 			int height = (int) core.terrainService.getHeight(obj1.getPlanetId(), segment.x, segment.z); // round down to int
 			
 			if(height > y) {
-				System.out.println("Collision took: " + (System.nanoTime() - startTime) + " ns (terrain collision)");				
+				//System.out.println("Collision took: " + (System.nanoTime() - startTime) + " ns (terrain collision)");				
 				return false;
 			}
 		}
-		System.out.println("Collision took: " + (System.nanoTime() - startTime) + " ns (did not collide)");
+		//System.out.println("Collision took: " + (System.nanoTime() - startTime) + " ns (did not collide)");
 
 		return true;