From c40cdc2968c58d952878c09a60926af74f782867 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 29 Dec 2013 19:37:20 +0100 Subject: Core/Chat: Fix assert triggered by .npc add Fix an assert in Aura::_UnapplyForTarget() caused by ".npc add" changing the guid of the spawned Creature. --- src/server/scripts/Commands/cs_npc.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 12d0d4ea4f2..0306aed184d 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -275,7 +275,11 @@ public: uint32 db_guid = creature->GetDBTableGUIDLow(); - // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells(); + // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells() + // current "creature" variable is deleted and created fresh new, otherwise old values might trigger asserts or cause undefined behavior + creature->CleanupsBeforeDelete(); + delete creature; + creature = new Creature(); if (!creature->LoadCreatureFromDB(db_guid, map)) { delete creature; -- cgit v1.2.3