From 37914ae4ea2d0393929af2db9820bc04db7a4f29 Mon Sep 17 00:00:00 2001 From: Golrag Date: Fri, 1 Nov 2024 21:15:02 +0100 Subject: Core/Texts: Fix nullptr when no BroadcastText is found closes #30392 (cherry picked from commit 05c8ad26c2f8c397ffcad743b1825bd47f719037) --- src/server/game/Texts/CreatureTextMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') 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); } -- cgit v1.2.3