Reduce usage of ChatHandler.

Author: ratkosrb

src/game/Anticheat/MovementAnticheat/MovementAnticheat.cpp

@@ -184,7 +184,7 @@ void MovementAnticheat::AddCheats(uint32 cheats, uint32 count)
         if (!cheatNames.empty())
         {
             if (sWorld.getConfig(CONFIG_BOOL_AC_MOVEMENT_NOTIFY_CHEATERS))
-                ChatHandler(m_session->GetPlayer()).PSendSysMessage("[AntiCheat] Detected cheats: %s", cheatNames.c_str());
+                m_session->GetPlayer()->PSendSysMessage("[AntiCheat] Detected cheats: %s", cheatNames.c_str());
 
             // Print detected cheats in place inside packet log.
             if (sWorld.getConfig(CONFIG_UINT32_AC_MOVEMENT_PACKET_LOG_SIZE))

src/game/Battlegrounds/BattleGroundMgr.cpp

@@ -32,7 +32,6 @@
 #include "Map.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
-#include "Chat.h"
 #include "World.h"
 #include "WorldPacket.h"
 #include "Language.h"
@@ -183,7 +182,7 @@ GroupQueueInfo* BattleGroundQueue::AddGroup(Player* leader, Group* grp, BattleGr
                 if (grp->GetMembersCount() > group_limit) // queue players solo if group size is above limit set in config
                 {
                     AddGroup(member, nullptr, bgTypeId, bracketId, false, instanceId, nullptr);
-                    ChatHandler(member).PSendSysMessage("Group queue limit is set to %u. You have been queued solo.", group_limit);
+                    member->PSendSysMessage("Group queue limit is set to %u. You have been queued solo.", group_limit);
                 }
                 else
                 {
@@ -242,7 +241,7 @@ GroupQueueInfo* BattleGroundQueue::AddGroup(Player* leader, Group* grp, BattleGr
                 // Show queue status to player only (when joining queue)
                 if (sWorld.getConfig(CONFIG_UINT32_BATTLEGROUND_QUEUE_ANNOUNCER_JOIN) == 1)
                 {
-                    ChatHandler(leader).PSendSysMessage(LANG_BG_QUEUE_ANNOUNCE_SELF, bgName, qMinLevel, qMaxLevel - 1,
+                    leader->PSendSysMessage(LANG_BG_QUEUE_ANNOUNCE_SELF, bgName, qMinLevel, qMaxLevel - 1,
                                                         qAlliance, (minPlayers > qAlliance) ? minPlayers - qAlliance : (uint32)0, qHorde, (minPlayers > qHorde) ? minPlayers - qHorde : (uint32)0);
                 }
                 // System message

src/game/Commands/AccountCommands.cpp

@@ -109,7 +109,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(char* args)
 
     if (targetPlayer)
     {
-        ChatHandler(targetPlayer).PSendSysMessage(LANG_YOURS_SECURITY_CHANGED, GetNameLink().c_str(), gm);
+        targetPlayer->PSendSysMessage(LANG_YOURS_SECURITY_CHANGED, GetNameLink().c_str(), gm);
         targetPlayer->GetSession()->SetSecurity(AccountTypes(gm));
     }
 
@@ -480,7 +480,7 @@ bool ChatHandler::HandleWarnCharacterCommand(char* args)
     sWorld.WarnAccount(playerData->uiAccount, authorName, reason, "WARN");
     sAccountMgr.WarnAccount(playerData->uiAccount, reason);
     if (pPlayer)
-        ChatHandler(pPlayer).PSendSysMessage(LANG_ACCOUNT_WARNED, reason);
+        pPlayer->PSendSysMessage(LANG_ACCOUNT_WARNED, reason);
 
     PSendSysMessage("Account #%u (character %s) has been warned for \"%s\"", playerData->uiAccount, playerData->sName.c_str(), reason);
     return true;
@@ -1148,7 +1148,7 @@ bool ChatHandler::HandleMuteCommand(char* args)
             pAura->RefreshHolder();
         }
 
-        ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime);
+        target->PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime);
     }
 
     std::string nameLink = playerLink(target_name);
@@ -1206,7 +1206,7 @@ bool ChatHandler::HandleUnmuteCommand(char* args)
     if (target)
     {
         target->RemoveAurasDueToSpell(SPELL_PLAYER_MUTED_VISUAL);
-        ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_ENABLED);
+        target->PSendSysMessage(LANG_YOUR_CHAT_ENABLED);
     } 
 
     std::string nameLink = playerLink(target_name);

src/game/Commands/CharacterCommands.cpp

@@ -1624,7 +1624,7 @@ bool ChatHandler::HandleDebugSpellModsCommand(char* args)
     PSendSysMessage(LANG_YOU_CHANGE_SPELLMODS, opcode == SMSG_SET_FLAT_SPELL_MODIFIER ? "flat" : "pct",
                     spellmodop, value, effidx, GetNameLink(chr).c_str());
     if (needReportToTarget(chr))
-        ChatHandler(chr).PSendSysMessage(LANG_YOURS_SPELLMODS_CHANGED, GetNameLink().c_str(),
+        chr->PSendSysMessage(LANG_YOURS_SPELLMODS_CHANGED, GetNameLink().c_str(),
                                          opcode == SMSG_SET_FLAT_SPELL_MODIFIER ? "flat" : "pct", spellmodop, value, effidx);
 
     WorldPacket data(opcode, (1 + 1 + 2 + 2));

src/game/Commands/DebugCommands.cpp

@@ -725,19 +725,19 @@ void ChatHandler::HandleInstanceUnbindHelper(Player* player, bool got_map, uint3
 
             if (MapEntry const* entry = sMapStorage.LookupEntry<MapEntry>(itr->first))
             {
-                ChatHandler(player).PSendSysMessage("unbinding map: %d (%s) inst: %d perm: %s canReset: %s TTR: %s",
+                player->PSendSysMessage("unbinding map: %d (%s) inst: %d perm: %s canReset: %s TTR: %s",
                     itr->first, entry->name, save->GetInstanceId(), itr->second.perm ? "yes" : "no",
                     save->CanReset() ? "yes" : "no", timeleft.c_str());
             }
             else
-                ChatHandler(player).PSendSysMessage("bound for a nonexistent map %u", itr->first);
+                player->PSendSysMessage("bound for a nonexistent map %u", itr->first);
             player->UnbindInstance(itr);
             counter++;
         }
         else
             ++itr;
     }
-    ChatHandler(player).PSendSysMessage("instances unbound: %d", counter);
+    player->PSendSysMessage("instances unbound: %d", counter);
 }
 
 bool ChatHandler::HandleInstanceUnbindCommand(char* args)

src/game/Commands/MiscCommands.cpp

@@ -158,7 +158,7 @@ bool ChatHandler::HandleTeleGroupCommand(char * args)
 
         PSendSysMessage(LANG_TELEPORTING_TO, plNameLink.c_str(), "", tele->name.c_str());
         if (needReportToTarget(pl))
-            ChatHandler(pl).PSendSysMessage(LANG_TELEPORTED_TO_BY, nameLink.c_str());
+            pl->PSendSysMessage(LANG_TELEPORTED_TO_BY, nameLink.c_str());
 
         // stop flight if need
         if (pl->IsTaxiFlying())
@@ -248,7 +248,7 @@ bool ChatHandler::HandleGroupgoCommand(char* args)
 
         PSendSysMessage(LANG_SUMMONING, plNameLink.c_str(), "");
         if (needReportToTarget(pl))
-            ChatHandler(pl).PSendSysMessage(LANG_SUMMONED_BY, nameLink.c_str());
+            pl->PSendSysMessage(LANG_SUMMONED_BY, nameLink.c_str());
 
         // stop flight if need
         if (pl->IsTaxiFlying())
@@ -689,7 +689,7 @@ bool ChatHandler::HandleTeleNameCommand(char* args)
 
         PSendSysMessage(LANG_TELEPORTING_TO, chrNameLink.c_str(), "", tele->name.c_str());
         if (needReportToTarget(target))
-            ChatHandler(target).PSendSysMessage(LANG_TELEPORTED_TO_BY, GetNameLink().c_str());
+            target->PSendSysMessage(LANG_TELEPORTED_TO_BY, GetNameLink().c_str());
 
         return HandleGoHelper(target, tele->mapId, tele->x, tele->y, &tele->z, &tele->o);
     }
@@ -1161,7 +1161,7 @@ bool ChatHandler::HandleNamegoCommand(char* args)
         }
         PSendSysMessage(LANG_SUMMONING, nameLink.c_str(), "");
         if (needReportToTarget(pTarget))
-            ChatHandler(pTarget).PSendSysMessage(LANG_SUMMONED_BY, playerLink(pPlayer->GetName()).c_str());
+            pTarget->PSendSysMessage(LANG_SUMMONED_BY, playerLink(pPlayer->GetName()).c_str());
 
         // stop flight if need
         if (pTarget->IsTaxiFlying())
@@ -1296,7 +1296,7 @@ bool ChatHandler::HandleGonameCommand(char* args)
 
         PSendSysMessage(LANG_APPEARING_AT_ONLINE, chrNameLink.c_str());
         if (needReportToTarget(pTarget))
-            ChatHandler(pTarget).PSendSysMessage(LANG_APPEARING_TO, GetNameLink().c_str());
+            pTarget->PSendSysMessage(LANG_APPEARING_TO, GetNameLink().c_str());
 
         // stop flight if need
         if (pPlayer->IsTaxiFlying())