From 80d920dab5d8688fda19b612ec58bcb1a576cbc0 Mon Sep 17 00:00:00 2001 From: HelloKitty Date: Tue, 25 Sep 2018 10:21:04 -0500 Subject: Fix issue in Creature::UpdateEntry and CMSG_GOSSIP_SELECT_OPTION (#22469) Address #22467 making it so that script doesn't look like it was reload and thus causing gossip to fail once after update. (cherry picked from commit d5888a5f8f498790dccde186325ab5bec87b066d) --- src/server/game/Entities/Creature/Creature.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 7d67aad21f0..92feefa27e3 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -674,9 +674,13 @@ bool Creature::UpdateEntry(uint32 entry, CreatureData const* data /*= nullptr*/, UpdateMovementFlags(); LoadCreaturesAddon(); + LoadTemplateImmunities(); - GetThreatManager().EvaluateSuppressed(); + + //We must update last scriptId or it looks like we reloaded a script, breaking some things such as gossip temporarily + LastUsedScriptID = GetScriptId(); + return true; } -- cgit v1.2.3