diff options
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 9 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_npc.cpp | 59 |
2 files changed, 38 insertions, 30 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 93489d5516b..5f25ae54a80 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1765,9 +1765,13 @@ void Creature::DeleteFromDB() return; } + // remove any scheduled respawns GetMap()->RemoveRespawnTime(SPAWN_TYPE_CREATURE, m_spawnId); + + // delete data from memory sObjectMgr->DeleteCreatureData(m_spawnId); + // delete data and all its associations from DB WorldDatabaseTransaction trans = WorldDatabase.BeginTransaction(); WorldDatabasePreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_DEL_CREATURE); @@ -1792,6 +1796,11 @@ void Creature::DeleteFromDB() trans->Append(stmt); WorldDatabase.CommitTransaction(trans); + + // then delete any active instances of the creature + auto const& range = GetMap()->GetCreatureBySpawnIdStore().equal_range(m_spawnId); + for (auto it = range.first; it != range.second; ++it) + it->second->AddObjectToRemoveList(); } bool Creature::IsInvisibleDueToDespawn() const diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 2ccbb67f26a..c770d499463 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -941,7 +941,9 @@ public: if (!player) return false; - if (!creature) + if (creature) + lowguid = creature->GetSpawnId(); + else { // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r char* cId = handler->extractKeyFromLink((char*)args, "Hcreature"); @@ -949,48 +951,45 @@ public: return false; lowguid = atoull(cId); - - // Attempting creature load from DB data - CreatureData const* data = sObjectMgr->GetCreatureData(lowguid); - if (!data) - { - handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, std::to_string(lowguid).c_str()); - handler->SetSentErrorMessage(true); - return false; - } - - if (player->GetMapId() != data->spawnPoint.GetMapId()) - { - handler->PSendSysMessage(LANG_COMMAND_CREATUREATSAMEMAP, std::to_string(lowguid).c_str()); - handler->SetSentErrorMessage(true); - return false; - } } - else - lowguid = creature->GetSpawnId(); + // Attempting creature load from DB data + CreatureData const* data = sObjectMgr->GetCreatureData(lowguid); + if (!data) + { + handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, std::to_string(lowguid).c_str()); + handler->SetSentErrorMessage(true); + return false; + } - if (creature) + if (player->GetMapId() != data->spawnPoint.GetMapId()) { - sObjectMgr->NewOrExistCreatureData(creature->GetSpawnId()).spawnPoint.Relocate(*player); - creature->UpdatePosition(*player); - creature->GetMotionMaster()->Initialize(); - if (creature->IsAlive()) // dead creature will reset movement generator at respawn - { - creature->setDeathState(JUST_DIED); - creature->Respawn(); - } + handler->PSendSysMessage(LANG_COMMAND_CREATUREATSAMEMAP, std::to_string(lowguid).c_str()); + handler->SetSentErrorMessage(true); + return false; } - WorldDatabasePreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_CREATURE_POSITION); + // update position in memory + const_cast<CreatureData*>(data)->spawnPoint.Relocate(*player); + // update position in DB + WorldDatabasePreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_CREATURE_POSITION); stmt->setFloat(0, player->GetPositionX()); stmt->setFloat(1, player->GetPositionY()); stmt->setFloat(2, player->GetPositionZ()); stmt->setFloat(3, player->GetOrientation()); stmt->setUInt64(4, lowguid); - WorldDatabase.Execute(stmt); + // respawn selected creature at the new location + if (creature) + { + if (creature->IsAlive()) + creature->setDeathState(JUST_DIED); + creature->Respawn(true); + if (!creature->GetRespawnCompatibilityMode()) + creature->AddObjectToRemoveList(); + } + handler->PSendSysMessage(LANG_COMMAND_CREATUREMOVED); return true; } |