Merge 5d7e563 into adbf4cf

Author: bozimmerman

src/game/ChatCommands/GMCommands.cpp

@@ -134,7 +134,27 @@ bool ChatHandler::HandlePInfoCommand(char* args)
     uint32 silv = (money % GOLD) / SILVER;
     uint32 copp = (money % GOLD) % SILVER;
     PSendSysMessage(LANG_PINFO_LEVEL, timeStr.c_str(), level, gold, silv, copp);
+    if (target)
+    {
+        uint32 mapId = target->GetMapId();
+        uint32 zoneId = target->GetZoneId();
+        float posX = target->GetPositionX();
+        float posY = target->GetPositionY();
+        float posZ = target->GetPositionZ();
+        float orientation = target->GetOrientation();
+
+        MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
+        AreaTableEntry const* zoneEntry = GetAreaEntryByAreaID(zoneId);
 
+        PSendSysMessage("Location: Map %u (%s), Zone %u (%s)",
+                        mapId,
+                        (mapEntry ? mapEntry->name[GetSessionDbcLocale()] : "<unknown>"),
+                        zoneId,
+                        (zoneEntry ? zoneEntry->area_name[GetSessionDbcLocale()] : "<unknown>"));
+
+        PSendSysMessage("Coordinates: X=%.2f Y=%.2f Z=%.2f O=%.2f",
+                        posX, posY, posZ, orientation);
+    }
     return true;
 }
 

src/game/ChatCommands/ListCommands.cpp

@@ -364,6 +364,45 @@ bool ChatHandler::HandleListItemCommand(char* args)
     return true;
 }
 
+bool ChatHandler::HandleListPlayersCommand(char* args)
+{
+    uint32 limit;
+    if (!ExtractOptUInt32(&args, limit, 100))
+    {
+        return false;
+    }
+
+    uint32 count = 0;
+
+    PSendSysMessage("Online Players (Limit %u):", limit);
+    PSendSysMessage("===========================================");
+
+    sObjectAccessor.DoForAllPlayers([&](Player* player)
+    {
+        if (count >= limit)
+        {
+            return;
+        }
+
+        uint32 mapId = player->GetMapId();
+        uint32 zoneId = player->GetZoneId();
+
+        MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
+        AreaTableEntry const* zoneEntry = GetAreaEntryByAreaID(zoneId);
+
+        PSendSysMessage("%-20s | Lvl %-2u | Map %u Zone %u (%s)",
+                       player->GetName(),
+                       player->getLevel(),
+                       mapId,
+                       zoneId,
+                       (zoneEntry ? zoneEntry->area_name[GetSessionDbcLocale()] : "Unknown"));
+
+        count++;
+    });
+
+    return true;
+}
+
 bool ChatHandler::HandleListObjectCommand(char* args)
 {
     // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r
@@ -520,4 +559,4 @@ bool ChatHandler::HandleListCreatureCommand(char* args)
 
     PSendSysMessage(LANG_COMMAND_LISTCREATUREMESSAGE, cr_id, cr_count);
     return true;
-}
+}

src/game/ChatCommands/LookupCommands.cpp

@@ -255,13 +255,6 @@ bool ChatHandler::HandleLookupAreaCommand(char* args)
 // Find tele in game_tele order by name
 bool ChatHandler::HandleLookupTeleCommand(char* args)
 {
-    if (!*args)
-    {
-        SendSysMessage(LANG_COMMAND_TELE_PARAMETER);
-        SetSentErrorMessage(true);
-        return false;
-    }
-
     std::string namepart = args;
     std::wstring wnamepart;
 

src/game/ChatCommands/TeleportationAndPositionCommands.cpp

@@ -1514,7 +1514,81 @@ bool ChatHandler::HandleTeleNameCommand(char* args)
         return false;
     }
 
-    // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
+    // id, or string, coordinates, or [name] Shift-click form |color|Htele:id|h[name]|h|r
+
+    // Try to parse as coordinates first: <mapid> <x> <y> <z> [orientation]
+    uint32 mapId;
+    float x, y, z, o = 0.0f;
+    char* mapStr = ExtractLiteralArg(&args);
+    if (mapStr && ExtractUInt32(&mapStr, mapId))
+    {
+        char* xStr = ExtractLiteralArg(&args);
+        char* yStr = ExtractLiteralArg(&args);
+        char* zStr = ExtractLiteralArg(&args);
+
+        if (xStr && yStr && zStr &&
+            ExtractFloat(&xStr, x) && ExtractFloat(&yStr, y) && ExtractFloat(&zStr, z))
+        {
+            char* oStr = ExtractLiteralArg(&args);
+            if (oStr)
+            {
+                ExtractFloat(&oStr, o);
+            }
+
+            MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
+            if (!mapEntry)
+            {
+                PSendSysMessage("Map %u does not exist.", mapId);
+                SetSentErrorMessage(true);
+                return false;
+            }
+
+            std::string chrNameLink = playerLink(target_name);
+
+            if (target)
+            {
+                // Online player
+                if (HasLowerSecurity(target))
+                {
+                    return false;
+                }
+
+                if (target->IsBeingTeleported())
+                {
+                    PSendSysMessage(LANG_IS_TELEPORTED, chrNameLink.c_str());
+                    SetSentErrorMessage(true);
+                    return false;
+                }
+
+                PSendSysMessage("Teleporting %s to map %u (%s) at coordinates %.2f, %.2f, %.2f",
+                               chrNameLink.c_str(), mapId, mapEntry->name[GetSessionDbcLocale()], x, y, z);
+
+                if (needReportToTarget(target))
+                {
+                    ChatHandler(target).PSendSysMessage(LANG_TELEPORTED_TO_BY, GetNameLink().c_str());
+                }
+
+                return HandleGoHelper(target, mapId, x, y, z, o);
+            }
+            else
+            {
+                // offline player
+                if (HasLowerSecurity(NULL, target_guid))
+                {
+                    return false;
+                }
+
+                PSendSysMessage("Teleporting %s %s to map %u at coordinates %.2f, %.2f, %.2f",
+                               chrNameLink.c_str(), GetMangosString(LANG_OFFLINE), mapId, x, y, z);
+
+                Player::SavePositionInDB(target_guid, mapId, x, y, z, o,
+                                       sTerrainMgr.GetZoneId(mapId, x, y, z));
+                return true;
+            }
+        }
+    }
+
+    // Not coordinates, restore args pointer and try as saved location name
     GameTele const* tele = ExtractGameTeleFromLink(&args);
     if (!tele)
     {
@@ -1568,6 +1642,7 @@ bool ChatHandler::HandleTeleNameCommand(char* args)
 }
 
 
+
 bool ChatHandler::HandleTeleCommand(char* args)
 {
     if (!*args)

src/game/WorldHandlers/Chat.cpp

@@ -340,6 +340,7 @@ ChatCommand* ChatHandler::getCommandTable()
         { "item",           SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleListItemCommand,            "", NULL },
         { "object",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleListObjectCommand,          "", NULL },
         { "talents",        SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleListTalentsCommand,         "", NULL },
+        { "players",        SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleListPlayersCommand,         "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
 

src/game/WorldHandlers/Chat.h

@@ -380,6 +380,7 @@ class ChatHandler
         bool HandleListCreatureCommand(char* args);
         bool HandleListItemCommand(char* args);
         bool HandleListObjectCommand(char* args);
+        bool HandleListPlayersCommand(char* args);
         bool HandleListTalentsCommand(char* args);
 
         bool HandleLookupAccountEmailCommand(char* args);