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

[12213] Fix crash at gm enter world

Browse source 
Signed-off-by: Yaki Khadafi <elsoldollo@gmail.com>
This commit is contained in:
Yaki Khadafi 2012-09-10 20:56:41 +03:00 • committed by Antz
parent 0182d3e409
commit 732ae88bed
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/game/Player.cpp
View file

@ -4085,9 +4085,7 @@ void Player::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c
void Player::SetPhaseAndMap(Player* target) const void Player::SetPhaseAndMap(Player* target) const
{ {
QueryResult *result = CharacterDatabase.PQuery("SELECT map, phase FROM character_phase_data WHERE guid = '%u'", target->GetGUIDLow()); if (QueryResult *result = CharacterDatabase.PQuery("SELECT map, phase FROM character_phase_data WHERE guid = '%u'", target->GetGUIDLow()))
if (result)
{ {
Field *fields = result->Fetch(); Field *fields = result->Fetch();
@ -19980,7 +19978,8 @@ void Player::SetPhaseMask(uint32 newPhaseMask, bool update)
bg->EventPlayerDroppedFlag(this); bg->EventPlayerDroppedFlag(this);
Unit::SetPhaseMask(newPhaseMask, update); Unit::SetPhaseMask(newPhaseMask, update);
GetSession()->SendSetPhaseShift(GetPhaseMask()); if (IsInWorld())
GetSession()->SendSetPhaseShift(GetPhaseMask());
} }
void Player::InitPrimaryProfessions() void Player::InitPrimaryProfessions()

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12212" #define REVISION_NR "12213"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__