Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-01-09 16:43:23 -06:00
parent 5c8f52d134 90a82a81ad
commit 1ffb1cef33
66 changed files with 1270 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/Level3.cpp
View File

@@ -6889,7 +6889,7 @@ bool ChatHandler::HandlePossessCommand(const char* args)
if (pUnit->GetTypeId() == TYPEID_PLAYER)
return false;
m_session->GetPlayer()->Possess(pUnit);
pUnit->SetCharmedOrPossessedBy(m_session->GetPlayer(), true);
return true;
}
@@ -6897,11 +6897,7 @@ bool ChatHandler::HandlePossessCommand(const char* args)
bool ChatHandler::HandleUnPossessCommand(const char* args)
{
// Use this command to also unpossess ourselves
if (m_session->GetPlayer()->isPossessed())
m_session->GetPlayer()->UnpossessSelf(false);
else
m_session->GetPlayer()->RemovePossess(false);
m_session->GetPlayer()->RemoveCharmedOrPossessedBy(NULL);
return true;
}