diff options
| author | Golrag <golrag.jeremy@gmail.com> | 2024-11-01 21:15:02 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-11-02 21:03:37 +0100 |
| commit | 37914ae4ea2d0393929af2db9820bc04db7a4f29 (patch) | |
| tree | 93ec6c84179cdead03cd9aa3eb8e73b81cd3a984 /src/server/game/Texts/CreatureTextMgr.cpp | |
| parent | 8c9cffc1e8d7509fe86115c4a259a41c4977e0b9 (diff) | |
Core/Texts: Fix nullptr when no BroadcastText is found
closes #30392
(cherry picked from commit 05c8ad26c2f8c397ffcad743b1825bd47f719037)
Diffstat (limited to 'src/server/game/Texts/CreatureTextMgr.cpp')
| -rw-r--r-- | src/server/game/Texts/CreatureTextMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index b0721924914..d955724c2b8 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -232,12 +232,12 @@ uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, WorldObject if (srcPlr) { - Trinity::CreatureTextTextBuilder builder(source, finalSource, finalSource->GetGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget, iter->BroadcastTextId, iter->emote, finalSound, finalPlayType, bct->ConditionID); + Trinity::CreatureTextTextBuilder builder(source, finalSource, finalSource->GetGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget, iter->BroadcastTextId, iter->emote, finalSound, finalPlayType, bct ? bct->ConditionID : 0); SendChatPacket(finalSource, builder, finalType, whisperTarget, range, team, gmOnly); } else { - Trinity::CreatureTextTextBuilder builder(finalSource, finalSource, finalSource->GetGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget, iter->BroadcastTextId, iter->emote, finalSound, finalPlayType, bct->ConditionID); + Trinity::CreatureTextTextBuilder builder(finalSource, finalSource, finalSource->GetGender(), finalType, iter->groupId, iter->id, finalLang, whisperTarget, iter->BroadcastTextId, iter->emote, finalSound, finalPlayType, bct ? bct->ConditionID : 0); SendChatPacket(finalSource, builder, finalType, whisperTarget, range, team, gmOnly); } |