birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sig/network - bugfix - removal of player prefabs on disconnect

Browse Source 
sig/network - bugfix - removal of player prefabs on disconnect
This commit is contained in:
Olex Lozitskiy
2021-06-24 15:01:41 -05:00
committed by GitHub
parent 7cc4cb270f 5a061e409d
commit be56cf648d
6 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Multiplayer/Code/Source/NetworkEntity/EntityReplication/EntityReplicationManager.h
+3 -1
View File
@@ -34,7 +34,9 @@ namespace Multiplayer
{
class IEntityDomain;
class EntityReplicator;
//! @class EntityReplicationManager
//! @brief Handles replication of relevant entities for one connection.
class EntityReplicationManager final
{
public:
Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
+6 -16
View File
@@ -277,15 +277,6 @@ namespace Multiplayer
{
//RewindableObjectState::ClearRewoundEntities();
// Keystone has refactored these API's, rewrite required
//AZ::SliceComponent* rootSlice = nullptr;
//{
// AzFramework::EntityContextId gameContextId = AzFramework::EntityContextId::CreateNull();
// AzFramework::GameEntityContextRequestBus::BroadcastResult(gameContextId, &AzFramework::GameEntityContextRequests::GetGameEntityContextId);
// AzFramework::EntityContextRequestBus::BroadcastResult(rootSlice, &AzFramework::EntityContextRequests::GetRootSlice);
// AZ_Assert(rootSlice != nullptr, "Root slice returned was NULL");
//}
AZStd::vector<NetEntityId> removeList;
removeList.swap(m_removeList);
for (NetEntityId entityId : removeList)
@@ -299,13 +290,12 @@ namespace Multiplayer
AZ_Assert(netBindComponent != nullptr, "NetBindComponent not found on networked entity");
netBindComponent->StopEntity();
// Delete Entity, method depends on how it was loaded
// Try slice removal first, then force delete
//AZ::Entity* rawEntity = removeEntity.GetEntity();
//if (!rootSlice->RemoveEntity(rawEntity))
//{
// delete rawEntity;
//}
// At the moment, we spawn one entity at a time and avoid Prefab API calls and never get a spawn ticket,
// so this is the right way for now. Once we support prefabs we can use AzFramework::SpawnableEntitiesContainer
// Additionally, prefabs spawning is async! Whereas we currently create entities immediately, see:
// @NetworkEntityManager::CreateEntitiesImmediate
AzFramework::GameEntityContextRequestBus::Broadcast(
&AzFramework::GameEntityContextRequestBus::Events::DestroyGameEntity, netBindComponent->GetEntityId());
}
m_networkEntityTracker.erase(entityId);
Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityUpdateMessage.cpp
+2 -1
View File
@@ -59,10 +59,11 @@ namespace Multiplayer
NetworkEntityUpdateMessage::NetworkEntityUpdateMessage(NetEntityId entityId, bool wasMigrated, bool takeOwnership)
: m_entityId(entityId)
, m_isDelete(true)
, m_wasMigrated(wasMigrated)
, m_takeOwnership(takeOwnership)
{
;
// this is a delete entity message c-tor
}
NetworkEntityUpdateMessage& NetworkEntityUpdateMessage::operator =(NetworkEntityUpdateMessage&& rhs)