mirror of
https://github.com/mangosfour/server.git
synced 2025-12-22 22:37:06 +00:00
Apply style fix pt3
This commit is contained in:
Antz
parent
1392c131e7
commit
d93dbd95fe
191 changed files with 9851 additions and 676 deletions
|
|
@ -198,7 +198,9 @@ bool ChatHandler::HandleAHBotStatusCommand(char* args)
|
|||
SendSysMessage(LANG_AHBOT_STATUS_MIDBAR_CONSOLE);
|
||||
}
|
||||
else
|
||||
{ SendSysMessage(LANG_AHBOT_STATUS_TITLE1_CHAT); }
|
||||
{
|
||||
SendSysMessage(LANG_AHBOT_STATUS_TITLE1_CHAT);
|
||||
}
|
||||
|
||||
uint32 fmtId = m_session ? LANG_AHBOT_STATUS_FORMAT_CHAT : LANG_AHBOT_STATUS_FORMAT_CONSOLE;
|
||||
|
||||
|
|
@ -227,7 +229,9 @@ bool ChatHandler::HandleAHBotStatusCommand(char* args)
|
|||
SendSysMessage(LANG_AHBOT_STATUS_MIDBAR_CONSOLE);
|
||||
}
|
||||
else
|
||||
{ SendSysMessage(LANG_AHBOT_STATUS_TITLE2_CHAT); }
|
||||
{
|
||||
SendSysMessage(LANG_AHBOT_STATUS_TITLE2_CHAT);
|
||||
}
|
||||
|
||||
for (int i = 0; i < MAX_AUCTION_QUALITY; ++i)
|
||||
PSendSysMessage(fmtId, GetMangosString(ahbotQualityIds[i]),
|
||||
|
|
@ -1367,14 +1371,18 @@ bool ChatHandler::HandleAchievementCommand(char* args)
|
|||
if (nameStr)
|
||||
{
|
||||
if (!ExtractPlayerTarget(&nameStr, &target))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
target = getSelectedPlayer();
|
||||
|
||||
uint32 achId;
|
||||
if (!ExtractUint32KeyFromLink(&args, "Hachievement", achId))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
AchievementEntry const* achEntry = sAchievementStore.LookupEntry(achId);
|
||||
if (!achEntry)
|
||||
|
|
@ -1406,11 +1414,15 @@ bool ChatHandler::HandleAchievementAddCommand(char* args)
|
|||
|
||||
Player* target;
|
||||
if (!ExtractPlayerTarget(&nameStr, &target))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32 achId;
|
||||
if (!ExtractUint32KeyFromLink(&args, "Hachievement", achId))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
AchievementEntry const* achEntry = sAchievementStore.LookupEntry(achId);
|
||||
if (!achEntry || achEntry->flags & ACHIEVEMENT_FLAG_COUNTER)
|
||||
|
|
@ -1448,11 +1460,15 @@ bool ChatHandler::HandleAchievementRemoveCommand(char* args)
|
|||
|
||||
Player* target;
|
||||
if (!ExtractPlayerTarget(&nameStr, &target))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32 achId;
|
||||
if (!ExtractUint32KeyFromLink(&args, "Hachievement", achId))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
AchievementEntry const* achEntry = sAchievementStore.LookupEntry(achId);
|
||||
if (!achEntry)
|
||||
|
|
@ -1484,10 +1500,14 @@ bool ChatHandler::HandleAchievementCriteriaAddCommand(char* args)
|
|||
// maybe player first
|
||||
char* nameStr = ExtractArg(&args);
|
||||
if (!ExtractPlayerTarget(&nameStr, &target))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!ExtractUint32KeyFromLink(&args, "Hachievement_criteria", criId))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
target = getSelectedPlayer();
|
||||
|
|
@ -1502,7 +1522,9 @@ bool ChatHandler::HandleAchievementCriteriaAddCommand(char* args)
|
|||
|
||||
AchievementEntry const* achEntry = sAchievementStore.LookupEntry(criEntry->referredAchievement);
|
||||
if (!achEntry)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
LocaleConstant loc = GetSessionDbcLocale();
|
||||
|
||||
|
|
@ -1523,7 +1545,9 @@ bool ChatHandler::HandleAchievementCriteriaAddCommand(char* args)
|
|||
|
||||
uint32 val;
|
||||
if (!ExtractOptUInt32(&args, val, maxValue ? maxValue : 1))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32 new_val;
|
||||
|
||||
|
|
@ -1551,10 +1575,14 @@ bool ChatHandler::HandleAchievementCriteriaRemoveCommand(char* args)
|
|||
// maybe player first
|
||||
char* nameStr = ExtractArg(&args);
|
||||
if (!ExtractPlayerTarget(&nameStr, &target))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!ExtractUint32KeyFromLink(&args, "Hachievement_criteria", criId))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
target = getSelectedPlayer();
|
||||
|
|
@ -1569,7 +1597,9 @@ bool ChatHandler::HandleAchievementCriteriaRemoveCommand(char* args)
|
|||
|
||||
AchievementEntry const* achEntry = sAchievementStore.LookupEntry(criEntry->referredAchievement);
|
||||
if (!achEntry)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
LocaleConstant loc = GetSessionDbcLocale();
|
||||
|
||||
|
|
@ -1590,7 +1620,9 @@ bool ChatHandler::HandleAchievementCriteriaRemoveCommand(char* args)
|
|||
|
||||
uint32 change;
|
||||
if (!ExtractOptUInt32(&args, change, maxValue ? maxValue : 1))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32 newval = change < progress ? progress - change : 0;
|
||||
|
||||
|
|
@ -1723,7 +1755,9 @@ bool ChatHandler::HandleUnLearnCommand(char* args)
|
|||
target->removeSpell(spell_id, false, !allRanks);
|
||||
}
|
||||
else
|
||||
{ SendSysMessage(LANG_FORGET_SPELL); }
|
||||
{
|
||||
SendSysMessage(LANG_FORGET_SPELL);
|
||||
}
|
||||
|
||||
if (GetTalentSpellCost(spell_id))
|
||||
target->SendTalentsInfoData(false);
|
||||
|
|
@ -2721,7 +2755,9 @@ bool ChatHandler::HandleLearnCommand(char* args)
|
|||
targetPlayer->learnSpellHighRank(spell);
|
||||
}
|
||||
else
|
||||
{ targetPlayer->learnSpell(spell, false); }
|
||||
{
|
||||
targetPlayer->learnSpell(spell, false);
|
||||
}
|
||||
|
||||
uint32 first_spell = sSpellMgr.GetFirstSpellInChain(spell);
|
||||
if (GetTalentSpellCost(first_spell))
|
||||
|
|
@ -2969,11 +3005,17 @@ bool ChatHandler::HandleListItemCommand(char* args)
|
|||
item_pos = "[equipped]";
|
||||
}
|
||||
else if (Player::IsInventoryPos(item_bag, item_slot))
|
||||
{ item_pos = "[in inventory]"; }
|
||||
{
|
||||
item_pos = "[in inventory]";
|
||||
}
|
||||
else if (Player::IsBankPos(item_bag, item_slot))
|
||||
{ item_pos = "[in bank]"; }
|
||||
{
|
||||
item_pos = "[in bank]";
|
||||
}
|
||||
else
|
||||
{ item_pos = ""; }
|
||||
{
|
||||
item_pos = "";
|
||||
}
|
||||
|
||||
PSendSysMessage(LANG_ITEMLIST_SLOT,
|
||||
item_guid, owner_name.c_str(), owner_guid, owner_acc, item_pos);
|
||||
|
|
@ -2989,7 +3031,9 @@ bool ChatHandler::HandleListItemCommand(char* args)
|
|||
count -= res_count;
|
||||
}
|
||||
else if (count)
|
||||
{ count = 0; }
|
||||
{
|
||||
count = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// mail case
|
||||
|
|
@ -3011,7 +3055,9 @@ bool ChatHandler::HandleListItemCommand(char* args)
|
|||
item_id, uint32(count));
|
||||
}
|
||||
else
|
||||
{ result = NULL; }
|
||||
{
|
||||
result = NULL;
|
||||
}
|
||||
|
||||
if (result)
|
||||
{
|
||||
|
|
@ -3042,7 +3088,9 @@ bool ChatHandler::HandleListItemCommand(char* args)
|
|||
count -= res_count;
|
||||
}
|
||||
else if (count)
|
||||
{ count = 0; }
|
||||
{
|
||||
count = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// auction case
|
||||
|
|
@ -3063,7 +3111,9 @@ bool ChatHandler::HandleListItemCommand(char* args)
|
|||
item_id, uint32(count));
|
||||
}
|
||||
else
|
||||
{ result = NULL; }
|
||||
{
|
||||
result = NULL;
|
||||
}
|
||||
|
||||
if (result)
|
||||
{
|
||||
|
|
@ -3202,7 +3252,9 @@ bool ChatHandler::HandleListObjectCommand(char* args)
|
|||
PSendSysMessage(LANG_GO_LIST_CHAT, guid, PrepareStringNpcOrGoSpawnInformation<GameObject>(guid).c_str(), guid, gInfo->name, x, y, z, mapid);
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_GO_LIST_CONSOLE, guid, PrepareStringNpcOrGoSpawnInformation<GameObject>(guid).c_str(), gInfo->name, x, y, z, mapid); }
|
||||
{
|
||||
PSendSysMessage(LANG_GO_LIST_CONSOLE, guid, PrepareStringNpcOrGoSpawnInformation<GameObject>(guid).c_str(), gInfo->name, x, y, z, mapid);
|
||||
}
|
||||
}
|
||||
while (result->NextRow());
|
||||
|
||||
|
|
@ -3279,7 +3331,9 @@ bool ChatHandler::HandleListCreatureCommand(char* args)
|
|||
PSendSysMessage(LANG_CREATURE_LIST_CHAT, guid, PrepareStringNpcOrGoSpawnInformation<Creature>(guid).c_str(), guid, cInfo->Name, x, y, z, mapid);
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_CREATURE_LIST_CONSOLE, guid, PrepareStringNpcOrGoSpawnInformation<Creature>(guid).c_str(), cInfo->Name, x, y, z, mapid); }
|
||||
{
|
||||
PSendSysMessage(LANG_CREATURE_LIST_CONSOLE, guid, PrepareStringNpcOrGoSpawnInformation<Creature>(guid).c_str(), cInfo->Name, x, y, z, mapid);
|
||||
}
|
||||
}
|
||||
while (result->NextRow());
|
||||
|
||||
|
|
@ -3317,7 +3371,9 @@ void ChatHandler::ShowItemListHelper(uint32 itemId, int loc_idx, Player* target
|
|||
PSendSysMessage(LANG_ITEM_LIST_CHAT, itemId, itemId, name.c_str(), usableStr);
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_ITEM_LIST_CONSOLE, itemId, name.c_str(), usableStr); }
|
||||
{
|
||||
PSendSysMessage(LANG_ITEM_LIST_CONSOLE, itemId, name.c_str(), usableStr);
|
||||
}
|
||||
}
|
||||
|
||||
bool ChatHandler::HandleLookupItemCommand(char* args)
|
||||
|
|
@ -3436,7 +3492,9 @@ bool ChatHandler::HandleLookupItemSetCommand(char* args)
|
|||
PSendSysMessage(LANG_ITEMSET_LIST_CHAT, id, id, name.c_str(), localeNames[loc]);
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_ITEMSET_LIST_CONSOLE, id, name.c_str(), localeNames[loc]); }
|
||||
{
|
||||
PSendSysMessage(LANG_ITEMSET_LIST_CONSOLE, id, name.c_str(), localeNames[loc]);
|
||||
}
|
||||
++counter;
|
||||
}
|
||||
}
|
||||
|
|
@ -3529,7 +3587,9 @@ bool ChatHandler::HandleLookupSkillCommand(char* args)
|
|||
PSendSysMessage(LANG_SKILL_LIST_CHAT, id, id, name.c_str(), localeNames[loc], knownStr, valStr);
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_SKILL_LIST_CONSOLE, id, name.c_str(), localeNames[loc], knownStr, valStr); }
|
||||
{
|
||||
PSendSysMessage(LANG_SKILL_LIST_CONSOLE, id, name.c_str(), localeNames[loc], knownStr, valStr);
|
||||
}
|
||||
|
||||
++counter;
|
||||
}
|
||||
|
|
@ -3593,7 +3653,9 @@ void ChatHandler::ShowSpellListHelper(Player* target, SpellEntry const* spellInf
|
|||
ss << id << " - |cffffffff|Hspell:" << id << "|h[" << spellInfo->SpellName[loc];
|
||||
}
|
||||
else
|
||||
{ ss << id << " - " << spellInfo->SpellName[loc]; }
|
||||
{
|
||||
ss << id << " - " << spellInfo->SpellName[loc];
|
||||
}
|
||||
|
||||
// include rank in link name
|
||||
if (rank)
|
||||
|
|
@ -3606,7 +3668,9 @@ void ChatHandler::ShowSpellListHelper(Player* target, SpellEntry const* spellInf
|
|||
ss << " " << localeNames[loc] << "]|h|r";
|
||||
}
|
||||
else
|
||||
{ ss << " " << localeNames[loc]; }
|
||||
{
|
||||
ss << " " << localeNames[loc];
|
||||
}
|
||||
|
||||
if (talent)
|
||||
{
|
||||
|
|
@ -3635,7 +3699,9 @@ void ChatHandler::ShowSpellListHelper(Player* target, SpellEntry const* spellInf
|
|||
bool ChatHandler::HandleLookupCurrencyCommand(char* args)
|
||||
{
|
||||
if (!*args)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// can be NULL at console call
|
||||
Player* target = getSelectedPlayer();
|
||||
|
|
@ -3644,7 +3710,9 @@ bool ChatHandler::HandleLookupCurrencyCommand(char* args)
|
|||
std::wstring wnamepart;
|
||||
|
||||
if (!Utf8toWStr(namepart, wnamepart))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// converting string that we try to find to lower case
|
||||
wstrToLower(wnamepart);
|
||||
|
|
@ -3792,10 +3860,14 @@ void ChatHandler::ShowQuestListHelper(uint32 questId, int32 loc_idx, Player* tar
|
|||
statusStr = GetMangosString(LANG_COMMAND_QUEST_REWARDED);
|
||||
}
|
||||
else
|
||||
{ statusStr = GetMangosString(LANG_COMMAND_QUEST_COMPLETE); }
|
||||
{
|
||||
statusStr = GetMangosString(LANG_COMMAND_QUEST_COMPLETE);
|
||||
}
|
||||
}
|
||||
else if (status == QUEST_STATUS_INCOMPLETE)
|
||||
{ statusStr = GetMangosString(LANG_COMMAND_QUEST_ACTIVE); }
|
||||
{
|
||||
statusStr = GetMangosString(LANG_COMMAND_QUEST_ACTIVE);
|
||||
}
|
||||
}
|
||||
|
||||
if (m_session)
|
||||
|
|
@ -3803,7 +3875,9 @@ void ChatHandler::ShowQuestListHelper(uint32 questId, int32 loc_idx, Player* tar
|
|||
PSendSysMessage(LANG_QUEST_LIST_CHAT, qinfo->GetQuestId(), qinfo->GetQuestId(), qinfo->GetQuestLevel(), title.c_str(), statusStr);
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_QUEST_LIST_CONSOLE, qinfo->GetQuestId(), title.c_str(), statusStr); }
|
||||
{
|
||||
PSendSysMessage(LANG_QUEST_LIST_CONSOLE, qinfo->GetQuestId(), title.c_str(), statusStr);
|
||||
}
|
||||
}
|
||||
|
||||
bool ChatHandler::HandleLookupQuestCommand(char* args)
|
||||
|
|
@ -3902,7 +3976,9 @@ bool ChatHandler::HandleLookupCreatureCommand(char* args)
|
|||
PSendSysMessage(LANG_CREATURE_ENTRY_LIST_CHAT, id, id, name);
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_CREATURE_ENTRY_LIST_CONSOLE, id, name); }
|
||||
{
|
||||
PSendSysMessage(LANG_CREATURE_ENTRY_LIST_CONSOLE, id, name);
|
||||
}
|
||||
|
||||
++counter;
|
||||
}
|
||||
|
|
@ -3954,7 +4030,9 @@ bool ChatHandler::HandleLookupObjectCommand(char* args)
|
|||
PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, itr->id, itr->id, name.c_str());
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, itr->id, name.c_str()); }
|
||||
{
|
||||
PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, itr->id, name.c_str());
|
||||
}
|
||||
++counter;
|
||||
continue;
|
||||
}
|
||||
|
|
@ -3975,7 +4053,9 @@ bool ChatHandler::HandleLookupObjectCommand(char* args)
|
|||
PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, itr->id, itr->id, name.c_str());
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, itr->id, name.c_str()); }
|
||||
{
|
||||
PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, itr->id, name.c_str());
|
||||
}
|
||||
++counter;
|
||||
}
|
||||
}
|
||||
|
|
@ -4417,19 +4497,27 @@ bool ChatHandler::HandleDamageCommand(char* args)
|
|||
bool ChatHandler::HandleModifyCurrencyCommand(char* args)
|
||||
{
|
||||
if (!*args)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32 currencyId;
|
||||
if (!ExtractUint32KeyFromLink(&args, "Hcurrency", currencyId))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
CurrencyTypesEntry const * entry = sCurrencyTypesStore.LookupEntry(currencyId);
|
||||
if (!entry)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
int32 amount;
|
||||
if (!ExtractInt32(&args, amount))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Player* target = getSelectedPlayer();
|
||||
if (!target)
|
||||
|
|
@ -4565,11 +4653,17 @@ bool ChatHandler::HandleLinkGraveCommand(char* args)
|
|||
g_team = TEAM_BOTH_ALLOWED;
|
||||
}
|
||||
else if (strncmp(teamStr, "horde", strlen(teamStr)) == 0)
|
||||
{ g_team = HORDE; }
|
||||
{
|
||||
g_team = HORDE;
|
||||
}
|
||||
else if (strncmp(teamStr, "alliance", strlen(teamStr)) == 0)
|
||||
{ g_team = ALLIANCE; }
|
||||
{
|
||||
g_team = ALLIANCE;
|
||||
}
|
||||
else
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
WorldSafeLocsEntry const* graveyard = sWorldSafeLocsStore.LookupEntry(g_id);
|
||||
if (!graveyard)
|
||||
|
|
@ -4596,7 +4690,9 @@ bool ChatHandler::HandleLinkGraveCommand(char* args)
|
|||
PSendSysMessage(LANG_COMMAND_GRAVEYARDLINKED, g_id, zoneId);
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_COMMAND_GRAVEYARDALRLINKED, g_id, zoneId); }
|
||||
{
|
||||
PSendSysMessage(LANG_COMMAND_GRAVEYARDALRLINKED, g_id, zoneId);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -4612,11 +4708,17 @@ bool ChatHandler::HandleNearGraveCommand(char* args)
|
|||
g_team = TEAM_BOTH_ALLOWED;
|
||||
}
|
||||
else if (strncmp(args, "horde", argslen) == 0)
|
||||
{ g_team = HORDE; }
|
||||
{
|
||||
g_team = HORDE;
|
||||
}
|
||||
else if (strncmp(args, "alliance", argslen) == 0)
|
||||
{ g_team = ALLIANCE; }
|
||||
{
|
||||
g_team = ALLIANCE;
|
||||
}
|
||||
else
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Player* player = m_session->GetPlayer();
|
||||
uint32 zone_id = player->GetZoneId();
|
||||
|
|
@ -4642,11 +4744,17 @@ bool ChatHandler::HandleNearGraveCommand(char* args)
|
|||
team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_ANY);
|
||||
}
|
||||
else if (data->team == HORDE)
|
||||
{ team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_HORDE); }
|
||||
{
|
||||
team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_HORDE);
|
||||
}
|
||||
else if (data->team == ALLIANCE)
|
||||
{ team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_ALLIANCE); }
|
||||
{
|
||||
team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_ALLIANCE);
|
||||
}
|
||||
else // Actually, this case can not happen
|
||||
{ team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_NOTEAM); }
|
||||
{
|
||||
team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_NOTEAM);
|
||||
}
|
||||
|
||||
PSendSysMessage(LANG_COMMAND_GRAVEYARDNEAREST, g_id, team_name.c_str(), zone_id);
|
||||
}
|
||||
|
|
@ -4659,16 +4767,22 @@ bool ChatHandler::HandleNearGraveCommand(char* args)
|
|||
team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_ANY);
|
||||
}
|
||||
else if (g_team == HORDE)
|
||||
{ team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_HORDE); }
|
||||
{
|
||||
team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_HORDE);
|
||||
}
|
||||
else if (g_team == ALLIANCE)
|
||||
{ team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_ALLIANCE); }
|
||||
{
|
||||
team_name = GetMangosString(LANG_COMMAND_GRAVEYARD_ALLIANCE);
|
||||
}
|
||||
|
||||
if (g_team == TEAM_BOTH_ALLOWED)
|
||||
{
|
||||
PSendSysMessage(LANG_COMMAND_ZONENOGRAVEYARDS, zone_id);
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id, team_name.c_str()); }
|
||||
{
|
||||
PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id, team_name.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
@ -4716,7 +4830,9 @@ bool ChatHandler::HandleNpcChangeEntryCommand(char* args)
|
|||
SendSysMessage(LANG_DONE);
|
||||
}
|
||||
else
|
||||
{ SendSysMessage(LANG_ERROR); }
|
||||
{
|
||||
SendSysMessage(LANG_ERROR);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -4823,11 +4939,15 @@ bool ChatHandler::HandleNpcAddWeaponCommand(char* /*args*/)
|
|||
|
||||
char* pSlotID = strtok((char*)args, " ");
|
||||
if (!pSlotID)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
char* pItemID = strtok(NULL, " ");
|
||||
if (!pItemID)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32 ItemID = atoi(pItemID);
|
||||
uint32 SlotID = atoi(pSlotID);
|
||||
|
|
@ -4934,9 +5054,13 @@ void ChatHandler::HandleCharacterLevel(Player* player, ObjectGuid player_guid, u
|
|||
ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_PROGRESS_RESET, GetNameLink().c_str());
|
||||
}
|
||||
else if (oldlevel < newlevel)
|
||||
{ ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_UP, GetNameLink().c_str(), newlevel); }
|
||||
{
|
||||
ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_UP, GetNameLink().c_str(), newlevel);
|
||||
}
|
||||
else // if(oldlevel > newlevel)
|
||||
{ ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_DOWN, GetNameLink().c_str(), newlevel); }
|
||||
{
|
||||
ChatHandler(player).PSendSysMessage(LANG_YOURS_LEVEL_DOWN, GetNameLink().c_str(), newlevel);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -4966,7 +5090,9 @@ bool ChatHandler::HandleCharacterLevelCommand(char* args)
|
|||
nolevel = true;
|
||||
}
|
||||
else
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Player* target;
|
||||
|
|
@ -5019,7 +5145,9 @@ bool ChatHandler::HandleLevelUpCommand(char* args)
|
|||
nameStr = ExtractArg(&args);
|
||||
}
|
||||
else
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -5192,11 +5320,17 @@ bool ChatHandler::HandleAuctionItemCommand(char* args)
|
|||
houseid = 1;
|
||||
}
|
||||
else if (strncmp(typeStr, "horde", strlen(typeStr)) == 0)
|
||||
{ houseid = 6; }
|
||||
{
|
||||
houseid = 6;
|
||||
}
|
||||
else if (strncmp(typeStr, "goblin", strlen(typeStr)) == 0)
|
||||
{ houseid = 7; }
|
||||
{
|
||||
houseid = 7;
|
||||
}
|
||||
else
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// parse item str
|
||||
char* itemStr = ExtractArg(&args);
|
||||
|
|
@ -5233,11 +5367,17 @@ bool ChatHandler::HandleAuctionItemCommand(char* args)
|
|||
etime = 1 * MIN_AUCTION_TIME;
|
||||
}
|
||||
else if (strncmp(timeStr, "long", strlen(timeStr)) == 0)
|
||||
{ etime = 2 * MIN_AUCTION_TIME; }
|
||||
{
|
||||
etime = 2 * MIN_AUCTION_TIME;
|
||||
}
|
||||
else if (strncmp(timeStr, "verylong", strlen(timeStr)) == 0)
|
||||
{ etime = 4 * MIN_AUCTION_TIME; }
|
||||
{
|
||||
etime = 4 * MIN_AUCTION_TIME;
|
||||
}
|
||||
else
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
AuctionHouseEntry const* auctionHouseEntry = sAuctionHouseStore.LookupEntry(houseid);
|
||||
|
|
@ -5543,7 +5683,9 @@ bool ChatHandler::HandleResetAchievementsCommand(char* args)
|
|||
Player* target;
|
||||
ObjectGuid target_guid;
|
||||
if (!ExtractPlayerTarget(&args, &target, &target_guid))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (target)
|
||||
target->GetAchievementMgr().Reset();
|
||||
|
|
@ -5844,7 +5986,9 @@ bool ChatHandler::HandleServerShutDownCommand(char* args)
|
|||
{
|
||||
uint32 delay;
|
||||
if (!ExtractUInt32(&args, delay))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32 exitcode;
|
||||
if (!ExtractOptUInt32(&args, exitcode, SHUTDOWN_EXIT_CODE))
|
||||
|
|
@ -6232,7 +6376,9 @@ bool ChatHandler::HandleBanHelper(BanMode mode, char* args)
|
|||
PSendSysMessage(LANG_BAN_YOUBANNED, nameOrIP.c_str(), secsToTimeString(duration_secs, true).c_str(), reason);
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_BAN_YOUPERMBANNED, nameOrIP.c_str(), reason); }
|
||||
{
|
||||
PSendSysMessage(LANG_BAN_YOUPERMBANNED, nameOrIP.c_str(), reason);
|
||||
}
|
||||
break;
|
||||
case BAN_SYNTAX_ERROR:
|
||||
return false;
|
||||
|
|
@ -6317,7 +6463,9 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, char* args)
|
|||
PSendSysMessage(LANG_UNBAN_UNBANNED, nameOrIP.c_str());
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_UNBAN_ERROR, nameOrIP.c_str()); }
|
||||
{
|
||||
PSendSysMessage(LANG_UNBAN_ERROR, nameOrIP.c_str());
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -6524,7 +6672,9 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result)
|
|||
}
|
||||
// "character" case, name need extract from another DB
|
||||
else
|
||||
{ sAccountMgr.GetName(account_id, account_name); }
|
||||
{
|
||||
sAccountMgr.GetName(account_id, account_name);
|
||||
}
|
||||
|
||||
// No SQL injection. id is uint32.
|
||||
QueryResult* banInfo = LoginDatabase.PQuery("SELECT bandate,unbandate,bannedby,banreason FROM account_banned WHERE id = %u ORDER BY unbandate", account_id);
|
||||
|
|
@ -6817,7 +6967,9 @@ bool ChatHandler::HandlePDumpWriteCommand(char* args)
|
|||
lowguid = guid.GetCounter();
|
||||
}
|
||||
else
|
||||
{ guid = ObjectGuid(HIGHGUID_PLAYER, lowguid); }
|
||||
{
|
||||
guid = ObjectGuid(HIGHGUID_PLAYER, lowguid);
|
||||
}
|
||||
|
||||
if (!sObjectMgr.GetPlayerAccountIdByGUID(guid))
|
||||
{
|
||||
|
|
@ -6876,16 +7028,22 @@ bool ChatHandler::HandleMovegensCommand(char* /*args*/)
|
|||
target = static_cast<ChaseMovementGenerator<Player> const*>(*itr)->GetTarget();
|
||||
}
|
||||
else
|
||||
{ target = static_cast<ChaseMovementGenerator<Creature> const*>(*itr)->GetTarget(); }
|
||||
{
|
||||
target = static_cast<ChaseMovementGenerator<Creature> const*>(*itr)->GetTarget();
|
||||
}
|
||||
|
||||
if (!target)
|
||||
{
|
||||
SendSysMessage(LANG_MOVEGENS_CHASE_NULL);
|
||||
}
|
||||
else if (target->GetTypeId() == TYPEID_PLAYER)
|
||||
{ PSendSysMessage(LANG_MOVEGENS_CHASE_PLAYER, target->GetName(), target->GetGUIDLow()); }
|
||||
{
|
||||
PSendSysMessage(LANG_MOVEGENS_CHASE_PLAYER, target->GetName(), target->GetGUIDLow());
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_MOVEGENS_CHASE_CREATURE, target->GetName(), target->GetGUIDLow()); }
|
||||
{
|
||||
PSendSysMessage(LANG_MOVEGENS_CHASE_CREATURE, target->GetName(), target->GetGUIDLow());
|
||||
}
|
||||
break;
|
||||
}
|
||||
case FOLLOW_MOTION_TYPE:
|
||||
|
|
@ -6896,16 +7054,22 @@ bool ChatHandler::HandleMovegensCommand(char* /*args*/)
|
|||
target = static_cast<FollowMovementGenerator<Player> const*>(*itr)->GetTarget();
|
||||
}
|
||||
else
|
||||
{ target = static_cast<FollowMovementGenerator<Creature> const*>(*itr)->GetTarget(); }
|
||||
{
|
||||
target = static_cast<FollowMovementGenerator<Creature> const*>(*itr)->GetTarget();
|
||||
}
|
||||
|
||||
if (!target)
|
||||
{
|
||||
SendSysMessage(LANG_MOVEGENS_FOLLOW_NULL);
|
||||
}
|
||||
else if (target->GetTypeId() == TYPEID_PLAYER)
|
||||
{ PSendSysMessage(LANG_MOVEGENS_FOLLOW_PLAYER, target->GetName(), target->GetGUIDLow()); }
|
||||
{
|
||||
PSendSysMessage(LANG_MOVEGENS_FOLLOW_PLAYER, target->GetName(), target->GetGUIDLow());
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_MOVEGENS_FOLLOW_CREATURE, target->GetName(), target->GetGUIDLow()); }
|
||||
{
|
||||
PSendSysMessage(LANG_MOVEGENS_FOLLOW_CREATURE, target->GetName(), target->GetGUIDLow());
|
||||
}
|
||||
break;
|
||||
}
|
||||
case HOME_MOTION_TYPE:
|
||||
|
|
@ -6914,7 +7078,9 @@ bool ChatHandler::HandleMovegensCommand(char* /*args*/)
|
|||
PSendSysMessage(LANG_MOVEGENS_HOME_CREATURE, x, y, z);
|
||||
}
|
||||
else
|
||||
{ SendSysMessage(LANG_MOVEGENS_HOME_PLAYER); }
|
||||
{
|
||||
SendSysMessage(LANG_MOVEGENS_HOME_PLAYER);
|
||||
}
|
||||
break;
|
||||
case FLIGHT_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_FLIGHT); break;
|
||||
case POINT_MOTION_TYPE:
|
||||
|
|
@ -6951,13 +7117,21 @@ bool ChatHandler::HandleServerPLimitCommand(char* args)
|
|||
sWorld.SetPlayerLimit(-SEC_PLAYER);
|
||||
}
|
||||
else if (strncmp(param, "moderator", l) == 0)
|
||||
{ sWorld.SetPlayerLimit(-SEC_MODERATOR); }
|
||||
{
|
||||
sWorld.SetPlayerLimit(-SEC_MODERATOR);
|
||||
}
|
||||
else if (strncmp(param, "gamemaster", l) == 0)
|
||||
{ sWorld.SetPlayerLimit(-SEC_GAMEMASTER); }
|
||||
{
|
||||
sWorld.SetPlayerLimit(-SEC_GAMEMASTER);
|
||||
}
|
||||
else if (strncmp(param, "administrator", l) == 0)
|
||||
{ sWorld.SetPlayerLimit(-SEC_ADMINISTRATOR); }
|
||||
{
|
||||
sWorld.SetPlayerLimit(-SEC_ADMINISTRATOR);
|
||||
}
|
||||
else if (strncmp(param, "reset", l) == 0)
|
||||
{ sWorld.SetPlayerLimit(sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT)); }
|
||||
{
|
||||
sWorld.SetPlayerLimit(sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT));
|
||||
}
|
||||
else if (ExtractInt32(¶m, val))
|
||||
{
|
||||
if (val < -SEC_ADMINISTRATOR)
|
||||
|
|
@ -6968,7 +7142,9 @@ bool ChatHandler::HandleServerPLimitCommand(char* args)
|
|||
sWorld.SetPlayerLimit(val);
|
||||
}
|
||||
else
|
||||
{ return false; }
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// kick all low security level players
|
||||
if (sWorld.GetPlayerAmountLimit() > SEC_PLAYER)
|
||||
|
|
@ -7398,7 +7574,9 @@ bool ChatHandler::HandleGMListFullCommand(char* /*args*/)
|
|||
delete result;
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_GMLIST_EMPTY); }
|
||||
{
|
||||
PSendSysMessage(LANG_GMLIST_EMPTY);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -7462,7 +7640,9 @@ bool ChatHandler::ShowPlayerListHelper(QueryResult* result, uint32* limit, bool
|
|||
PSendSysMessage(LANG_CHARACTERS_LIST_LINE_CONSOLE, guid, name.c_str(), race_name, class_name, level);
|
||||
}
|
||||
else
|
||||
{ PSendSysMessage(LANG_CHARACTERS_LIST_LINE_CHAT, guid, name.c_str(), name.c_str(), race_name, class_name, level); }
|
||||
{
|
||||
PSendSysMessage(LANG_CHARACTERS_LIST_LINE_CHAT, guid, name.c_str(), name.c_str(), race_name, class_name, level);
|
||||
}
|
||||
}
|
||||
while (result->NextRow());
|
||||
|
||||
|
|
@ -7941,10 +8121,14 @@ bool ChatHandler::HandleShowGearScoreCommand(char* args)
|
|||
|
||||
uint32 withBags, withBank;
|
||||
if (!ExtractOptUInt32(&args, withBags, 1))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!ExtractOptUInt32(&args, withBank, 0))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// always recalculate gear score for display
|
||||
player->ResetCachedGearScore();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue