server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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 GitHub
parent f2ae3ed7b7
commit a2accf6029
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/Object/Player.cpp
View File

@ -2465,9 +2465,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);
@ -2479,9 +2479,11 @@ 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);
CallForAllControlledUnits(SetGameMasterOffHelper(getFaction()), CONTROLLED_PET | CONTROLLED_TOTEMS | CONTROLLED_GUARDIANS | CONTROLLED_CHARM); CallForAllControlledUnits(SetGameMasterOffHelper(getFaction()), CONTROLLED_PET | CONTROLLED_TOTEMS | CONTROLLED_GUARDIANS | CONTROLLED_CHARM);
// restore FFA PvP Server state // restore FFA PvP Server state

2
src/game/WorldHandlers/Chat.cpp
View File

@ -1546,7 +1546,7 @@ bool ChatHandler::ShowHelpForCommand(ChatCommand* table, const char* cmd)
break; break;
} }
if (!command->Help.empty()) if (command && !command->Help.empty())
{ {
std::string helpText = command->Help; std::string helpText = command->Help;