From 81193e3e3ad41f7aea303b00292ebb6bc9394889 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Mon, 15 Nov 2021 20:59:07 -0500
Subject: [PATCH] Fix issue in Creature::UpdateEntry and
 CMSG_GOSSIP_SELECT_OPTION

Port From (https://github.com/TrinityCore/TrinityCore/commit/80d920dab5d8688fda19b612ec58bcb1a576cbc0)
---
 Source/Game/Entities/Creature/Creature.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs
index 2849f1dc6..6cbffaa56 100644
--- a/Source/Game/Entities/Creature/Creature.cs
+++ b/Source/Game/Entities/Creature/Creature.cs
@@ -414,9 +414,13 @@ namespace Game.Entities
 
             UpdateMovementFlags();
             LoadCreaturesAddon();
-            LoadTemplateImmunities();
 
+            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;
         }