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

moving where CallOnClientEnterRoom is called (#1922)

Browse Source
This commit is contained in:
James Frowen 2020-08-14 09:47:44 +01:00 committed by GitHub
parent fc48e0ecf9
commit 71bf792db5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Mirror/Components/NetworkRoomManager.cs
View File

@ -221,7 +221,7 @@ public void CheckReadyToBegin()
} }
} }
void CallOnClientEnterRoom() internal void CallOnClientEnterRoom()
{ {
OnRoomClientEnter(); OnRoomClientEnter();
foreach (NetworkRoomPlayer player in roomSlots) foreach (NetworkRoomPlayer player in roomSlots)
@ -465,7 +465,6 @@ public override void OnStartClient()
public override void OnClientConnect(NetworkConnection conn) public override void OnClientConnect(NetworkConnection conn)
{ {
OnRoomClientConnect(conn); OnRoomClientConnect(conn);
CallOnClientEnterRoom();
base.OnClientConnect(conn); base.OnClientConnect(conn);
} }

2
Assets/Mirror/Components/NetworkRoomPlayer.cs
View File

@ -59,7 +59,7 @@ public void Start()
room.RecalculateRoomPlayerIndices(); room.RecalculateRoomPlayerIndices();
if (NetworkClient.active) if (NetworkClient.active)
OnClientEnterRoom(); room.CallOnClientEnterRoom();
} }
else else
logger.LogError("RoomPlayer could not find a NetworkRoomManager. The RoomPlayer requires a NetworkRoomManager object to function. Make sure that there is one in the scene."); logger.LogError("RoomPlayer could not find a NetworkRoomManager. The RoomPlayer requires a NetworkRoomManager object to function. Make sure that there is one in the scene.");