Merge commit '1a075f0454fcfc1fb23432e6853af4a36730de98' into 4.3.4

Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.h
This commit is contained in:
Carbenium committed 2015-07-21 18:04:43 +02:00
commit 38027226ff
10 files changed
+426 -421

No files matched your search

+4 -3
View File
@@ -525,13 +525,14 @@ public:
handler->PSendSysMessage(LANG_SUMMONING, nameLink.c_str(), handler->GetTrinityString(LANG_OFFLINE));
// in point where GM stay
Player::SavePositionInDB(handler->GetSession()->GetPlayer()->GetMapId(),
SQLTransaction dummy;
Player::SavePositionInDB(WorldLocation(handler->GetSession()->GetPlayer()->GetMapId(),
handler->GetSession()->GetPlayer()->GetPositionX(),
handler->GetSession()->GetPlayer()->GetPositionY(),
handler->GetSession()->GetPlayer()->GetPositionZ(),
handler->GetSession()->GetPlayer()->GetOrientation(),
handler->GetSession()->GetPlayer()->GetOrientation()),
handler->GetSession()->GetPlayer()->GetZoneId(),
targetGuid);
targetGuid, dummy);
}
return true;