From edd6d65fb2851a68cb3a86f0c162ed1bc4bfe8dc Mon Sep 17 00:00:00 2001
From: r0m1ntik <40755539+r0m1ntik@users.noreply.github.com>
Date: Sun, 21 Mar 2021 15:19:18 +0100
Subject: [PATCH] fix(Core/Command): crash on set model to npc if not valid
 (#4874)

---
 src/server/scripts/Commands/cs_npc.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index fd6c9b1f6..299bd9a63 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -21,6 +21,7 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "TargetedMovementGenerator.h"                      // for HandleNpcUnFollowCommand
 #include "Transport.h"
+#include <string>
 
 struct NpcFlagText
 {
@@ -922,6 +923,13 @@ public:
             return false;
         }
 
+        if (!sCreatureDisplayInfoStore.LookupEntry(displayId))
+        {
+            handler->PSendSysMessage(LANG_COMMAND_FACTION_INVPARAM, std::to_string(displayId).c_str());
+            handler->SetSentErrorMessage(true);
+            return false;
+        }
+
         creature->SetDisplayId(displayId);
         creature->SetNativeDisplayId(displayId);