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

Fixed crash when non-net entities get activated

Browse Source 
Signed-off-by: pereslav <pereslav@amazon.com>
This commit is contained in:
pereslav
2021-07-08 17:07:51 +01:00
parent 4f523e496f
commit ffb4a3c432
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Multiplayer/Code/Source/ReplicationWindows/ServerToClientReplicationWindow.cpp
+5 -4
View File
@@ -201,10 +201,11 @@ namespace Multiplayer
void ServerToClientReplicationWindow::OnEntityActivated(AZ::Entity* entity)
{
ConstNetworkEntityHandle entityHandle(entity, GetNetworkEntityTracker());
NetBindComponent* netBindComponent = entityHandle.GetNetBindComponent();
NetBindComponent* netBindComponent = entity->FindComponent<NetBindComponent>();
if (netBindComponent != nullptr)
{
ConstNetworkEntityHandle entityHandle(netBindComponent, GetNetworkEntityTracker());
if (netBindComponent->HasController())
{
if (IFilterEntityManager* filter = GetMultiplayer()->GetFilterEntityManager())
@@ -233,10 +234,10 @@ namespace Multiplayer
void ServerToClientReplicationWindow::OnEntityDeactivated(AZ::Entity* entity)
{
ConstNetworkEntityHandle entityHandle(entity, GetNetworkEntityTracker());
NetBindComponent* netBindComponent = entityHandle.GetNetBindComponent();
NetBindComponent* netBindComponent = entity->FindComponent<NetBindComponent>();
if (netBindComponent != nullptr)
{
ConstNetworkEntityHandle entityHandle(netBindComponent, GetNetworkEntityTracker());
m_replicationSet.erase(entityHandle);
}
}