Skip to content
This repository has been archived by the owner on Oct 4, 2022. It is now read-only.

Bugfix net binding destroying random entities #499

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bugfix net binding destroying random entities #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a5a7cf
Update NetBindingSystemImpl.cpp
CDufour909 Jun 29, 2020
9282d4a
Update NetBindingSystemImpl.h
CDufour909 Jun 29, 2020
a1c8704
Update NetBindingSystemImpl.cpp
CDufour909 Jul 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions dev/Code/Framework/AzFramework/AzFramework/Network/NetBindingSystemImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,11 @@ namespace AzFramework
EBUS_EVENT(GameEntityContextRequestBus, CancelDynamicSliceInstantiation, m_ticket);
}

for (AZ::Entity* entity : m_boundEntities)
for (AZ::EntityId boundEntityId : m_boundEntities)
{
AZ_ExtraTracePrintf("NetBindingSystemImpl", "Cleanup - deleting %llu\n", entity->GetId());
EBUS_EVENT(GameEntityContextRequestBus, DestroyGameEntity, entity->GetId());
AZ_Assert(boundEntityId != AZ::SystemEntityId, "NetBindingSliceInstantiationHandler is destroying the system entity");
AZ_ExtraTracePrintf("NetBindingSystemImpl", "Cleanup - deleting %llu\n", boundEntityId);
EBUS_EVENT(GameEntityContextRequestBus, DestroyGameEntity, boundEntityId);
}
}

Expand Down Expand Up @@ -123,9 +124,12 @@ namespace AzFramework

bool NetBindingSliceInstantiationHandler::HasActiveEntities() const
{
for (const AZ::Entity* entity : m_boundEntities)
for (const AZ::EntityId boundEntityId : m_boundEntities)
{
if (entity->GetState() == AZ::Entity::ES_ACTIVE)
AZ::Entity* entity = nullptr;
AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, boundEntityId);

if (entity && entity->GetState() == AZ::Entity::ES_ACTIVE)
{
return true;
}
Expand Down Expand Up @@ -196,7 +200,7 @@ namespace AzFramework
}

AZ_ExtraTracePrintf("NetBindingSystemImpl", "Adding %llu \n", sliceEntity->GetId());
m_boundEntities.push_back(sliceEntity);
m_boundEntities.push_back(sliceEntity->GetId());
}

m_state = State::Spawned;
Expand Down Expand Up @@ -247,8 +251,8 @@ namespace AzFramework
}

const AZ::EntityId actualRuntimeEntityId = actualRuntimeIter->second;
const auto itCache = AZStd::find_if(m_boundEntities.begin(), m_boundEntities.end(), [&actualRuntimeEntityId](AZ::Entity* entity) {
return entity->GetId() == actualRuntimeEntityId;
const auto itCache = AZStd::find_if(m_boundEntities.begin(), m_boundEntities.end(), [&actualRuntimeEntityId](AZ::EntityId boundEntityId) {
return boundEntityId == actualRuntimeEntityId;
});

if (itCache != m_boundEntities.end())
Expand Down Expand Up @@ -495,13 +499,19 @@ namespace AzFramework
if (itSliceHandler != itCurrentContextQueue->second.end())
{
NetBindingSliceInstantiationHandler& sliceHandler = itSliceHandler->second;
for (AZ::Entity* entity : sliceHandler.m_boundEntities)
for (AZ::EntityId boundEntityId : sliceHandler.m_boundEntities)
{
if (entity->GetId() == entityId)
{
entity->Deactivate();
return;
}
if(boundEntityId == entityId)
{
AZ::Entity* entity = nullptr;
AZ::ComponentApplicationBus::BroadcastResult(entity, &AZ::ComponentApplicationRequests::FindEntity, boundEntityId);

if (entity)
{
entity->Deactivate();
return;
}
}
}

// clean any relevant bind requests as well
Expand Down
2 changes: 1 addition & 1 deletion dev/Code/Framework/AzFramework/AzFramework/Network/NetBindingSystemImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace AzFramework
* \breif a cache of entities that might be networked at some point
* \note they might be bound and unbound if their replicas leave and come back in the view
*/
AZStd::vector<AZ::Entity*> m_boundEntities;
AZStd::vector<AZ::EntityId> m_boundEntities;

/**
* \brief identifies which slice instance the instantiation will be performed for
Expand Down