aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/Creature.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index e8d48b55f38..efad9c5e484 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -795,6 +795,11 @@ bool Creature::isCanTrainingAndResetTalentsOf(Player* pPlayer) const
void Creature::prepareGossipMenu( Player *pPlayer,uint32 gossipid )
{
+ //Prevent gossip from NPCs that are possessed.
+ Unit* Charmed = Unit::GetCharmer();
+ if (Charmed)
+ return;
+
PlayerMenu* pm=pPlayer->PlayerTalkClass;
pm->ClearMenus();