mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'origin/master' into 320

Browse source 
Conflicts:
	src/game/CharacterHandler.cpp
	src/game/DuelHandler.cpp
	src/game/ItemHandler.cpp
	src/game/Mail.cpp
	src/game/MiscHandler.cpp
	src/game/MovementHandler.cpp
	src/game/TaxiHandler.cpp
	src/game/WorldSession.h
	src/game/WorldSocket.cpp
This commit is contained in:
tomrus88 2009-08-17 10:31:02 +04:00
commit f553cf2887
38 changed files with 181 additions and 755 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/game/Player.cpp
View file

@ -14213,6 +14213,9 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
const WorldLocation& _loc = GetBattleGroundEntryPoint();
SetLocationMapId(_loc.mapid);
Relocate(_loc.coord_x, _loc.coord_y, _loc.coord_z, _loc.orientation);
// We are not in BG anymore
m_bgData.bgInstanceID = 0;
}
}
else