aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MiscHandler.cpp
diff options
context:
space:
mode:
authorMeji <alvaro.megias@outlook.com>2024-12-29 00:43:01 +0100
committerOvahlord <dreadkiller@gmx.de>2024-12-29 12:17:56 +0100
commit01bf45468b19707d1c3b80cf9069cd7e17bb2c02 (patch)
treebf2eb7acc731a715877027c656dcc4139c469680 /src/server/game/Handlers/MiscHandler.cpp
parent74f9ad8c2e3efa6b18ecb0f7df6a6e37a85d3c3f (diff)
Core/Gossip: Fix interaction with gossip launched by accepting quest (#30419)
(cherry picked from commit 75bc3021da469d7c8eddbff23e5f1ec7c4a4dfbb)
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
-rw-r--r--src/server/game/Handlers/MiscHandler.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 679d95a46b8..7e53503c8f4 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -1151,7 +1151,9 @@ void WorldSession::HandleMountSetFavorite(WorldPackets::Misc::MountSetFavorite&
void WorldSession::HandleCloseInteraction(WorldPackets::Misc::CloseInteraction& closeInteraction)
{
- if (_player->PlayerTalkClass->GetInteractionData().SourceGuid == closeInteraction.SourceGuid)
+ if (_player->PlayerTalkClass->GetInteractionData().IsLaunchedByQuest)
+ _player->PlayerTalkClass->GetInteractionData().IsLaunchedByQuest = false;
+ else if (_player->PlayerTalkClass->GetInteractionData().SourceGuid == closeInteraction.SourceGuid)
_player->PlayerTalkClass->GetInteractionData().Reset();
if (_player->GetStableMaster() == closeInteraction.SourceGuid)