Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/DataStores/DBCStructure.h src/server/game/Entities/Item/ItemPrototype.h src/server/game/Globals/ObjectMgr.cpp src/server/game/Guilds/Guild.cpp src/server/game/Handlers/ItemHandler.cpp src/server/shared/Packets/ByteBuffer.h
This commit is contained in:
commit
528b9d4f7d
30 files changed
+623
-56
No files matched your search
@@ -41,6 +41,7 @@ public:
|
||||
{ "cooldown", SEC_GAMEMASTER, false, &HandleCoolDownCheatCommand, "", NULL },
|
||||
{ "power", SEC_GAMEMASTER, false, &HandlePowerCheatCommand, "", NULL },
|
||||
{ "waterwalk", SEC_GAMEMASTER, false, &HandleWaterWalkCheatCommand, "", NULL },
|
||||
{ "status", SEC_GAMEMASTER, false, &HandleCheatStatusCommand, "", NULL },
|
||||
{ "taxi", SEC_GAMEMASTER, false, &HandleTaxiCheatCommand, "", NULL },
|
||||
{ "explore", SEC_GAMEMASTER, false, &HandleExploreCheatCommand, "", NULL },
|
||||
{ NULL, 0, false, NULL, "", NULL }
|
||||
@@ -159,6 +160,22 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool HandleCheatStatusCommand(ChatHandler* handler, const char* /*args*/)
|
||||
{
|
||||
Player* player = handler->GetSession()->GetPlayer();
|
||||
|
||||
const char* enabled = "enabled";
|
||||
const char* disabled = "disabled";
|
||||
|
||||
handler->SendSysMessage(LANG_COMMAND_CHEAT_STATUS);
|
||||
handler->PSendSysMessage(LANG_COMMAND_CHEAT_GOD, player->GetCommandStatus(CHEAT_GOD) ? enabled : disabled);
|
||||
handler->PSendSysMessage(LANG_COMMAND_CHEAT_CD, player->GetCommandStatus(CHEAT_COOLDOWN) ? enabled : disabled);
|
||||
handler->PSendSysMessage(LANG_COMMAND_CHEAT_CT, player->GetCommandStatus(CHEAT_CASTTIME) ? enabled : disabled);
|
||||
handler->PSendSysMessage(LANG_COMMAND_CHEAT_POWER, player->GetCommandStatus(CHEAT_POWER) ? enabled : disabled);
|
||||
handler->PSendSysMessage(LANG_COMMAND_CHEAT_WW, player->GetCommandStatus(CHEAT_WATERWALK) ? enabled : disabled);
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool HandleWaterWalkCheatCommand(ChatHandler* handler, const char* args)
|
||||
{
|
||||
if (!handler->GetSession() && !handler->GetSession()->GetPlayer())
|
||||
|
||||
Reference in new issue
Block a user