charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct order of Destroy in RemovePlayer (#262)

Browse Source 
The RemovePlayerController call sets the playerController to null, causing a null dereference  (and a memory leak as pointed out by @paulpach, since gameobjects are never destroyed)
This commit is contained in:
Robin Rolf 2019-01-08 22:12:17 +01:00 committed by vis2k
parent eaa506fb26
commit c490d9faa0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mirror/Runtime/ClientScene.cs
View File

@ -121,10 +121,11 @@ public static bool RemovePlayer()
RemovePlayerMessage msg = new RemovePlayerMessage();
s_ReadyConnection.Send((short)MsgType.RemovePlayer, msg);
Object.Destroy(s_ReadyConnection.playerController.gameObject);
s_ReadyConnection.RemovePlayerController();
s_LocalPlayer = null;
Object.Destroy(s_ReadyConnection.playerController.gameObject);
return true;
}
return false;

2
Mirror/Runtime/NetworkServer.cs
View File

@ -821,8 +821,8 @@ static void OnRemovePlayerMessage(NetworkMessage netMsg)
{
if (netMsg.conn.playerController != null)
{
netMsg.conn.RemovePlayerController();
Destroy(netMsg.conn.playerController.gameObject);
netMsg.conn.RemovePlayerController();
}
else
{