From c944adf62f4e236efece49e7b07a4a34dd803145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Buratto?= <46575243+joaoburatto@users.noreply.github.com> Date: Sat, 30 Sep 2023 19:18:31 -0300 Subject: [PATCH] Fix issues with merge --- Assets/Scripts/SS3D/Permissions/PermissionSystem.cs | 2 +- Assets/Scripts/SS3D/Systems/PlayerControl/PlayerSystem.cs | 4 ++-- ProjectSettings/ProjectSettings.asset | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/SS3D/Permissions/PermissionSystem.cs b/Assets/Scripts/SS3D/Permissions/PermissionSystem.cs index 093fcea210..c456b12b60 100644 --- a/Assets/Scripts/SS3D/Permissions/PermissionSystem.cs +++ b/Assets/Scripts/SS3D/Permissions/PermissionSystem.cs @@ -95,7 +95,7 @@ public void ChangeUserPermission(string ckey, ServerRoleTypes role) { ServerRoleTypes previousRole = _userPermissions.TryGetValue(ckey, out ServerRoleTypes permission) ? permission : ServerRoleTypes.None; - Punpun.Information(this, $"Updating user {ckey} role from {previousRole} to {role}"); + Log.Information(this, $"Updating user {ckey} role from {previousRole} to {role}"); _userPermissions[ckey] = role; diff --git a/Assets/Scripts/SS3D/Systems/PlayerControl/PlayerSystem.cs b/Assets/Scripts/SS3D/Systems/PlayerControl/PlayerSystem.cs index 3a7f500ff8..dc3262a2cc 100644 --- a/Assets/Scripts/SS3D/Systems/PlayerControl/PlayerSystem.cs +++ b/Assets/Scripts/SS3D/Systems/PlayerControl/PlayerSystem.cs @@ -166,7 +166,7 @@ private void ProcessAuthorizePlayer(NetworkConnection conn, UserAuthorizationMes if (playedHasConnectedAlready) { - Punpun.Information(this, "Player match for {ckey} found, reassigning to client", Logs.ServerOnly, ckey); + Log.Information(this, "Player match for {ckey} found, reassigning to client", Logs.ServerOnly, ckey); } else { @@ -179,7 +179,7 @@ private void ProcessAuthorizePlayer(NetworkConnection conn, UserAuthorizationMes if (conn.IsHost && PermissionSettings.AddServerOwnerPermissionToServerHost) { - Punpun.Information(this, $"Adding ServerOwner permission to server owner: {ckey}", Logs.ServerOnly, ckey); + Log.Information(this, $"Adding ServerOwner permission to server owner: {ckey}", Logs.ServerOnly, ckey); Subsystems.Get().ChangeUserPermission(ckey, ServerRoleTypes.ServerOwner); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e348d6df31..ffe99cfe79 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -143,7 +143,6 @@ PlayerSettings: - {fileID: 11400000, guid: 3c59f55e6898e694083e7a1ede49fe18, type: 2} - {fileID: 11400000, guid: 2024dd0c65f45424f98ac0c8a6979181, type: 2} - {fileID: 11400000, guid: 97967903e9bd51b499aaa39639cc9bb2, type: 2} - - {fileID: 11400000, guid: c15209f668bbfab479eb5184981c2bf7, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1