Now we can inspect player when GM mode is ON (#98)

* Now we can inspect player when GM mode is ON

* Fix potential crash in ExecuteCommand
This commit is contained in:
Elmsroth 2020-05-23 19:44:47 +02:00 committed by Antz
parent 118c779dff
commit 54e92fcbcd

View file

@ -2621,9 +2621,9 @@ void Player::SetGameMaster(bool on)
if (on) if (on)
{ {
m_ExtraFlags |= PLAYER_EXTRA_GM_ON; m_ExtraFlags |= PLAYER_EXTRA_GM_ON;
setFaction(35); //setFaction(35);
SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_0);
SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM); SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM);
CallForAllControlledUnits(SetGameMasterOnHelper(), CONTROLLED_PET | CONTROLLED_TOTEMS | CONTROLLED_GUARDIANS | CONTROLLED_CHARM); CallForAllControlledUnits(SetGameMasterOnHelper(), CONTROLLED_PET | CONTROLLED_TOTEMS | CONTROLLED_GUARDIANS | CONTROLLED_CHARM);
SetFFAPvP(false); SetFFAPvP(false);
@ -2637,7 +2637,8 @@ void Player::SetGameMaster(bool on)
else else
{ {
m_ExtraFlags &= ~ PLAYER_EXTRA_GM_ON; m_ExtraFlags &= ~ PLAYER_EXTRA_GM_ON;
setFactionForRace(getRace()); //setFactionForRace(getRace());
RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_0);
RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM); RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM);
// restore phase // restore phase