nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-14 17:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/ChatHandler): Add SendErrorMessage helper (#17919)

Browse Source 
* feat(Core/Chat): Add SendErrorMessage helper

* lost boy
This commit is contained in:
Kitzunu
2023-12-02 19:25:32 +01:00
committed by GitHub
parent 5bfeabde81
commit db4b0b0d3d
40 changed files with 503 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/server/scripts/Commands/cs_modify.cpp
View File

@@ -108,15 +108,13 @@ public:
{
if (modifyValue < 1)
{
handler->SendSysMessage(LANG_BAD_VALUE);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_BAD_VALUE);
return false;
}
if (!target)
{
handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
return false;
}
@@ -257,8 +255,7 @@ public:
Creature* target = handler->getSelectedCreature();
if (!target)
{
handler->SendSysMessage(LANG_SELECT_CREATURE);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_SELECT_CREATURE);
return false;
}
@@ -297,8 +294,7 @@ public:
if (!sFactionTemplateStore.LookupEntry(factionid))
{
handler->PSendSysMessage(LANG_WRONG_FACTION, factionid);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_WRONG_FACTION, factionid);
return false;
}
@@ -318,8 +314,7 @@ public:
Player* target = handler->getSelectedPlayer();
if (!target)
{
handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
return false;
}
@@ -356,8 +351,7 @@ public:
Unit* target = handler->getSelectedUnit();
if (!target)
{
handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
return false;
}
@@ -387,8 +381,7 @@ public:
}
}
handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
return false;
}
@@ -396,15 +389,13 @@ public:
{
if (speed > maximumBound || speed < minimumBound)
{
handler->SendSysMessage(LANG_BAD_VALUE);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_BAD_VALUE);
return false;
}
if (!target)
{
handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
return false;
}
@@ -418,8 +409,7 @@ public:
if (player->IsInFlight() && checkInFlight)
{
handler->PSendSysMessage(LANG_CHAR_IN_FLIGHT, handler->GetNameLink(player).c_str());
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_CHAR_IN_FLIGHT, handler->GetNameLink(player).c_str());
return false;
}
}
@@ -505,16 +495,14 @@ public:
{
if (scale > 10.0f || scale < 0.1f)
{
handler->SendSysMessage(LANG_BAD_VALUE);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_BAD_VALUE);
return false;
}
Unit* target = handler->getSelectedUnit();
if (!target)
{
handler->SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_SELECT_CHAR_OR_CREATURE);
return false;
}
@@ -539,16 +527,14 @@ public:
{
if (!sCreatureDisplayInfoStore.LookupEntry(creatureDisplayID))
{
handler->SendSysMessage(LANG_NO_MOUNT);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_NO_MOUNT);
return false;
}
Player* target = handler->getSelectedPlayerOrSelf();
if (!target)
{
handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
return false;
}
@@ -584,8 +570,7 @@ public:
Player* target = handler->getSelectedPlayer();
if (!target)
{
handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
return false;
}
@@ -676,8 +661,7 @@ public:
Unit* target = handler->getSelectedUnit();
if (!target)
{
handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_NO_CHAR_SELECTED);
return false;
}
@@ -689,15 +673,13 @@ public:
if (field < OBJECT_END || field >= target->GetValuesCount())
{
handler->SendSysMessage(LANG_BAD_VALUE);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_BAD_VALUE);
return false;
}
if (bit < 1 || bit > 32)
{
handler->SendSysMessage(LANG_BAD_VALUE);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_BAD_VALUE);
return false;
}
@@ -720,8 +702,7 @@ public:
Player* target = handler->getSelectedPlayer();
if (!target)
{
handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
return false;
}
@@ -758,8 +739,7 @@ public:
Player* target = handler->getSelectedPlayer();
if (!target)
{
handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
return false;
}
@@ -804,8 +784,7 @@ public:
{
if (*delta < 0 || (*delta > ReputationMgr::PointsInRank[r] - 1))
{
handler->PSendSysMessage(LANG_COMMAND_FACTION_DELTA, ReputationMgr::PointsInRank[r] - 1);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_COMMAND_FACTION_DELTA, ReputationMgr::PointsInRank[r] - 1);
return false;
}
@@ -820,8 +799,7 @@ public:
if (r >= MAX_REPUTATION_RANK)
{
handler->PSendSysMessage(LANG_COMMAND_FACTION_INVPARAM, rankStr.c_str());
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_COMMAND_FACTION_INVPARAM, rankStr.c_str());
return false;
}
}
@@ -839,15 +817,13 @@ public:
if (!factionEntry)
{
handler->PSendSysMessage(LANG_COMMAND_FACTION_UNKNOWN, factionId);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_COMMAND_FACTION_UNKNOWN, factionId);
return false;
}
if (factionEntry->reputationListID < 0)
{
handler->PSendSysMessage(LANG_COMMAND_FACTION_NOREP_ERROR, factionEntry->name[handler->GetSessionDbcLocale()], factionId);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_COMMAND_FACTION_NOREP_ERROR, factionEntry->name[handler->GetSessionDbcLocale()], factionId);
return false;
}
@@ -922,8 +898,7 @@ public:
Player* target = handler->getSelectedPlayer();
if (!target)
{
handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
return false;
}
@@ -944,8 +919,7 @@ public:
Player* target = handler->getSelectedPlayer();
if (!target)
{
handler->PSendSysMessage(LANG_PLAYER_NOT_FOUND);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_PLAYER_NOT_FOUND);
return false;
}
@@ -973,8 +947,7 @@ public:
}
else
{
handler->SendSysMessage(LANG_MUST_MALE_OR_FEMALE);
handler->SetSentErrorMessage(true);
handler->SendErrorMessage(LANG_MUST_MALE_OR_FEMALE);
return false;
}