Fix crash from wrong data in aura field of creature_addon and creature_template_addon

This commit is contained in:
hondacrx
2017-06-20 16:21:36 -04:00
parent 768812b91f
commit cebaa26a69
+8 -2
View File
@@ -1836,7 +1836,10 @@ namespace Game
byte i = 0; byte i = 0;
for (var c = 0; c < tokens.Length; ++c) for (var c = 0; c < tokens.Length; ++c)
{ {
uint spellId = uint.Parse(tokens[c].Replace(",", "")); string id = tokens[c].Trim().Replace(",", "");
if (!uint.TryParse(id, out uint spellId))
continue;
SpellInfo AdditionalSpellInfo = Global.SpellMgr.GetSpellInfo(spellId); SpellInfo AdditionalSpellInfo = Global.SpellMgr.GetSpellInfo(spellId);
if (AdditionalSpellInfo == null) if (AdditionalSpellInfo == null)
{ {
@@ -1940,7 +1943,10 @@ namespace Game
creatureAddon.auras = new uint[tokens.Length]; creatureAddon.auras = new uint[tokens.Length];
for (var c = 0; c < tokens.Length; ++c) for (var c = 0; c < tokens.Length; ++c)
{ {
uint spellId = uint.Parse(tokens[c]); string id = tokens[c].Trim().Replace(",", "");
if (!uint.TryParse(id, out uint spellId))
continue;
SpellInfo AdditionalSpellInfo = Global.SpellMgr.GetSpellInfo(spellId); SpellInfo AdditionalSpellInfo = Global.SpellMgr.GetSpellInfo(spellId);
if (AdditionalSpellInfo == null) if (AdditionalSpellInfo == null)
{ {