Merge branch 'master' of github.com:TrinityCore/TrinityCore

1 files changed, 23 insertions, 0 deletions

diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp
index 85e0ff2390b..8bfa010463a 100644
--- a/src/server/scripts/Commands/cs_tele.cpp
+++ b/src/server/scripts/Commands/cs_tele.cpp
@@ -125,6 +125,29 @@ public:
         if (!handler->extractPlayerTarget(nameStr, &target, &target_guid, &target_name))
             return false;
 
+        if (strcmp(teleStr, "$home") == 0)    // References target's homebind
+        { 
+            if (target)
+                target->TeleportTo(target->m_homebindMapId, target->m_homebindX, target->m_homebindY, target->m_homebindZ, target->GetOrientation());
+            else
+            {
+                QueryResult resultDB = CharacterDatabase.PQuery("SELECT mapId, zoneId, posX, posY, posZ FROM character_homebind WHERE guid = %u", target_guid);
+                if (resultDB)
+                {
+                    Field* fieldsDB = resultDB->Fetch();
+                    uint32 mapId = fieldsDB[0].GetUInt32();
+                    uint32 zoneId = fieldsDB[1].GetUInt32();
+                    float posX = fieldsDB[2].GetFloat();
+                    float posY = fieldsDB[3].GetFloat();
+                    float posZ = fieldsDB[4].GetFloat();
+                    
+                    Player::SavePositionInDB(mapId, posX, posY, posZ, 0, zoneId, target_guid);
+                }
+            }
+                
+            return true;
+        }
+
         // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
         GameTele const* tele = handler->extractGameTeleFromLink(teleStr);
         if (!tele)