diff -r c85b35f07651 src/server/game/Chat/Commands/Level1.cpp
--- a/src/server/game/Chat/Commands/Level1.cpp  Tue Nov 09 10:57:23 2010 -0500
+++ b/src/server/game/Chat/Commands/Level1.cpp  Tue Nov 09 22:25:35 2010 +0100
@@ -541,6 +541,52 @@
     return false;
 }

+bool ChatHandler::HandleTeleCommand(const char * args)
+{
+    if (!*args)
+        return false;
+
+    Player* _player = m_session->GetPlayer();
+
+    // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
+    GameTele const* tele = extractGameTeleFromLink((char*)args);
+
+    if (!tele)
+    {
+        SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    if (_player->isInCombat())
+    {
+        SendSysMessage(LANG_YOU_IN_COMBAT);
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    MapEntry const * me = sMapStore.LookupEntry(tele->mapId);
+    if (!me || me->IsBattlegroundOrArena())
+    {
+        SendSysMessage(LANG_CANNOT_TELE_TO_BG);
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    // stop flight if need
+    if (_player->isInFlight())
+    {
+        _player->GetMotionMaster()->MovementExpired();
+        _player->CleanupAfterTaxiFlight();
+    }
+    // save only in non-flight case
+    else
+        _player->SaveRecallPosition();
+
+    _player->TeleportTo(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation);
+    return true;
+}
+
 bool ChatHandler::HandleLookupAreaCommand(const char* args)
 {
     if (!*args)
diff -r c85b35f07651 src/server/scripts/Commands/cs_modify.cpp
--- a/src/server/scripts/Commands/cs_modify.cpp Tue Nov 09 10:57:23 2010 -0500
+++ b/src/server/scripts/Commands/cs_modify.cpp Tue Nov 09 22:25:35 2010 +0100
@@ -1114,52 +1114,6 @@
             return true;
         }

-        static bool HandleTeleCommand(ChatHandler* handler, const char* args)
-        {
-            if (!*args)
-                return false;
-
-            Player* me = handler->GetSession()->GetPlayer();
-
-            // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
-            GameTele const* tele = handler->extractGameTeleFromLink((char*)args);
-
-            if (!tele)
-            {
-                handler->SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
-                handler->SetSentErrorMessage(true);
-                return false;
-            }
-
-            if (me->isInCombat())
-            {
-                handler->SendSysMessage(LANG_YOU_IN_COMBAT);
-                handler->SetSentErrorMessage(true);
-                return false;
-            }
-
-            MapEntry const * map = sMapStore.LookupEntry(tele->mapId);
-            if (!map || map->IsBattlegroundOrArena())
-            {
-                handler->SendSysMessage(LANG_CANNOT_TELE_TO_BG);
-                handler->SetSentErrorMessage(true);
-                return false;
-            }
-
-            // stop flight if need
-            if (me->isInFlight())
-            {
-                me->GetMotionMaster()->MovementExpired();
-                me->CleanupAfterTaxiFlight();
-            }
-            // save only in non-flight case
-            else
-                me->SaveRecallPosition();
-
-            me->TeleportTo(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation);
-            return true;
-        }
-
         static bool HandleModifyDrunkCommand(ChatHandler* handler, const char* args)
         {
             if (!*args)    return false;