Fix .npc set model not saving the displayid

KalopsiaTwilight · Jun 23, 2024 · bf0ac46 · bf0ac46
1 parent 3d3b3ec
commit bf0ac46
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/server/game/Freedom/FreedomMgr.cpp b/src/server/game/Freedom/FreedomMgr.cpp
@@ -432,6 +432,15 @@ void FreedomMgr::CreatureSetAnimKitId(Creature* creature, uint16 animKitId)
     creature->SetAIAnimKitId(animKitId);
 }
 
+void FreedomMgr::CreatureSetModel(Creature* creature, uint32 displayId) {
+    creature->SetDisplayId(displayId);
+    creature->SetNativeDisplayId(displayId);
+
+    _creatureExtraStore[creature->GetSpawnId()].displayLock = true;
+    _creatureExtraStore[creature->GetSpawnId()].displayId = displayId;
+    _creatureExtraStore[creature->GetSpawnId()].nativeDisplayId = displayId;
+}
+
 bool FreedomMgr::CreatureCanSwim(Creature const* creature)
 {
     return _creatureExtraStore[creature->GetSpawnId()].swim;

diff --git a/src/server/game/Freedom/FreedomMgr.h b/src/server/game/Freedom/FreedomMgr.h
@@ -272,6 +272,7 @@ class TC_GAME_API FreedomMgr
         void CreatureSetSwim(Creature* creature, bool toggle);
         void CreatureSetFly(Creature* creature, bool toggle);
         void CreatureSetAnimKitId(Creature* creature, uint16 animKitId);
+        void CreatureSetModel(Creature* creature, uint32 displayId);
         bool CreatureCanSwim(Creature const* creature);
         bool CreatureCanWalk(Creature const* creature);
         bool CreatureCanFly(Creature const* creature);

diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
@@ -1128,9 +1128,7 @@ class npc_commandscript : public CommandScript
             return true;
         }
 
-        target->SetDisplayId(displayId);
-        target->SetNativeDisplayId(displayId);
-
+        sFreedomMgr->CreatureSetModel(target, displayId);
         sFreedomMgr->CreatureSetModifyHistory(target, source);
         sFreedomMgr->SaveCreature(target);