diff --git a/dGame/EntityManager.cpp b/dGame/EntityManager.cpp index ad0c0b1c..66cd7c78 100644 --- a/dGame/EntityManager.cpp +++ b/dGame/EntityManager.cpp @@ -320,7 +320,7 @@ const std::unordered_map& EntityManager::GetSpawnPointEnt return m_SpawnPoints; } -void EntityManager::ConstructEntity(Entity* entity, const SystemAddress& sysAddr, const bool skipChecks) { +void EntityManager::ConstructEntity(Entity* entity, const SystemAddress& sysAddr) { if (!entity) { LOG("Attempted to construct null entity"); return; @@ -363,16 +363,12 @@ void EntityManager::ConstructEntity(Entity* entity, const SystemAddress& sysAddr entity->WriteComponents(stream, eReplicaPacketType::CONSTRUCTION); if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) { - if (skipChecks) { - Game::server->Send(stream, UNASSIGNED_SYSTEM_ADDRESS, true); - } else { - for (auto* player : PlayerManager::GetAllPlayers()) { - if (player->GetPlayerReadyForUpdates()) { - Game::server->Send(stream, player->GetSystemAddress(), false); - } else { - auto* ghostComponent = player->GetComponent(); - if (ghostComponent) ghostComponent->AddLimboConstruction(entity->GetObjectID()); - } + for (auto* player : PlayerManager::GetAllPlayers()) { + if (player->GetPlayerReadyForUpdates()) { + Game::server->Send(stream, player->GetSystemAddress(), false); + } else { + auto* ghostComponent = player->GetComponent(); + if (ghostComponent) ghostComponent->AddLimboConstruction(entity->GetObjectID()); } } } else { diff --git a/dGame/EntityManager.h b/dGame/EntityManager.h index fdbb1a55..5d22280f 100644 --- a/dGame/EntityManager.h +++ b/dGame/EntityManager.h @@ -42,7 +42,7 @@ public: const std::unordered_map GetAllEntities() const { return m_Entities; } #endif - void ConstructEntity(Entity* entity, const SystemAddress& sysAddr = UNASSIGNED_SYSTEM_ADDRESS, bool skipChecks = false); + void ConstructEntity(Entity* entity, const SystemAddress& sysAddr = UNASSIGNED_SYSTEM_ADDRESS); void DestructEntity(Entity* entity, const SystemAddress& sysAddr = UNASSIGNED_SYSTEM_ADDRESS); void SerializeEntity(Entity* entity); void SerializeEntity(const Entity& entity); diff --git a/dWorldServer/WorldServer.cpp b/dWorldServer/WorldServer.cpp index 0f433493..c83b82d7 100644 --- a/dWorldServer/WorldServer.cpp +++ b/dWorldServer/WorldServer.cpp @@ -1045,7 +1045,7 @@ void HandlePacket(Packet* packet) { const auto respawnPoint = player->GetCharacter()->GetRespawnPoint(Game::zoneManager->GetZone()->GetWorldID()); - Game::entityManager->ConstructEntity(player, UNASSIGNED_SYSTEM_ADDRESS, true); + Game::entityManager->ConstructEntity(player, UNASSIGNED_SYSTEM_ADDRESS); if (respawnPoint != NiPoint3Constant::ZERO) { GameMessages::SendPlayerReachedRespawnCheckpoint(player, respawnPoint, NiQuaternionConstant::IDENTITY);