Scripts/Commands: Fix crash caused by .set npc model

Port From (https://github.com/TrinityCore/TrinityCore/commit/ff2cd4a0322fc2942323702a37844b0cfa963ce4)
This commit is contained in:
hondacrx
2021-11-18 17:18:02 -05:00
parent 9268b931c8
commit a31eb8647b
3 changed files with 8 additions and 2 deletions
+1 -1
View File
@@ -375,7 +375,7 @@ namespace Framework.Constants
CommandModifyArena = 306, CommandModifyArena = 306,
CommandFactionNotfound = 307, CommandFactionNotfound = 307,
CommandFactionUnknown = 308, CommandFactionUnknown = 308,
CommandFactionInvparam = 309, CommandInvalidParam = 309,
CommandFactionDelta = 310, CommandFactionDelta = 310,
FactionList = 311, FactionList = 311,
FactionVisible = 312, FactionVisible = 312,
+1 -1
View File
@@ -425,7 +425,7 @@ namespace Game.Chat
if (i == ReputationMgr.ReputationRankThresholds.Length - 1) if (i == ReputationMgr.ReputationRankThresholds.Length - 1)
{ {
handler.SendSysMessage(CypherStrings.CommandFactionInvparam, rankTxt); handler.SendSysMessage(CypherStrings.CommandInvalidParam, rankTxt);
return false; return false;
} }
+6
View File
@@ -1219,6 +1219,12 @@ namespace Game.Chat
return false; return false;
} }
if (!CliDB.CreatureDisplayInfoStorage.ContainsKey(displayId))
{
handler.SendSysMessage(CypherStrings.CommandInvalidParam, args);
return false;
}
creature.SetDisplayId(displayId); creature.SetDisplayId(displayId);
creature.SetNativeDisplayId(displayId); creature.SetNativeDisplayId(displayId);