Fix issues with merge

RE-SS3D · Sep 30, 2023 · c944adf · c944adf
1 parent 92645ed
commit c944adf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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<PermissionSystem>().ChangeUserPermission(ckey, ServerRoleTypes.ServerOwner);
                 }

diff --git 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