From f8c3743991a6897c7133bf35dc2699b8b5f9df7c Mon Sep 17 00:00:00 2001
From: Kahrl <kahrl@gmx.net>
Date: Mon, 19 Mar 2012 03:04:16 +0100
Subject: added PlayerSAO and RemotePlayer, removed ServerRemotePlayer

---
 src/servercommand.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'src/servercommand.cpp')

diff --git a/src/servercommand.cpp b/src/servercommand.cpp
index e2e84bacb..c5b242b2e 100644
--- a/src/servercommand.cpp
+++ b/src/servercommand.cpp
@@ -20,6 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "utility.h"
 #include "settings.h"
 #include "main.h" // For g_settings
+#include "content_sao.h"
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 
@@ -216,20 +217,26 @@ void cmd_teleport(std::wostringstream &os,
 		return;
 	}
 
-	v3f dest(stoi(coords[0])*10, stoi(coords[1])*10, stoi(coords[2])*10);
+	v3f dest(stoi(coords[0])*BS, stoi(coords[1])*BS, stoi(coords[2])*BS);
 
 	actionstream<<ctx->player->getName()<<" teleports from "
 			<<PP(ctx->player->getPosition()/BS)<<" to "
 			<<PP(dest/BS)<<std::endl;
 
-	//ctx->player->setPosition(dest);
-
-	// Use the ServerActiveObject interface of ServerRemotePlayer
-	ServerRemotePlayer *srp = static_cast<ServerRemotePlayer*>(ctx->player);
-	srp->setPos(dest);
-	ctx->server->SendMovePlayer(ctx->player);
-
-	os<< L"-!- Teleported.";
+	// Use the ServerActiveObject interface of RemotePlayer
+	// This forces a position change on the client
+	ServerActiveObject *sao = ctx->player->getPlayerSAO();
+	if(sao)
+	{
+		sao->setPos(dest);
+		os<< L"-!- Teleported.";
+	}
+	else
+	{
+		errorstream<<"Teleport failed, player object not found!"
+			<<std::endl;
+		os<< L"-!- Teleport failed.";
+	}
 }
 
 void cmd_banunban(std::wostringstream &os, ServerCommandContext *ctx)
-- 
cgit v1.2.3