diff --git a/src/game/Chat/Level2.cpp b/src/game/Chat/Level2.cpp index 4dfd98ffe8..09294305db 100644 --- a/src/game/Chat/Level2.cpp +++ b/src/game/Chat/Level2.cpp @@ -1922,7 +1922,9 @@ bool ChatHandler::HandleNpcDeleteCommand(char* args) case CREATURE_SUBTYPE_GENERIC: { unit->CombatStop(); - if (CreatureData const* data = sObjectMgr.GetCreatureData(unit->GetDbGuid())) + if (unit->IsUsingNewSpawningSystem()) // might be used in spawn group or scheduled for respawn already + unit->AddObjectToRemoveList(); + else if (CreatureData const* data = sObjectMgr.GetCreatureData(unit->GetDbGuid())) { // chat commands execute in world thread so should be thread safe for now sMapMgr.DoForAllMapsWithMapId(data->mapid, [&](Map* map)