mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-09 09:39:57 +00:00
Code Issues Projects Releases Wiki Activity

slightly optimize

Browse Source
This commit is contained in:
JohnCorby 2021-12-27 15:38:29 -08:00
parent 23421993d2
commit 3d386e00f7
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
QSB/Player/QSBPlayerManager.cs
View File

@ -24,12 +24,6 @@ namespace QSB.Player
return uint.MaxValue; return uint.MaxValue;
} }
if (localInstance.NetIdentity == null)
{
DebugLog.ToConsole($"Error - Trying to get LocalPlayerId when the local PlayerTransformSync instance's QNetworkIdentity is null.", MessageType.Error);
return uint.MaxValue;
}
return localInstance.NetIdentity.NetId.Value; return localInstance.NetIdentity.NetId.Value;
} }
} }
@ -38,13 +32,13 @@ namespace QSB.Player
public static Action<uint> OnAddPlayer; public static Action<uint> OnAddPlayer;
public static PlayerInfo LocalPlayer => GetPlayer(LocalPlayerId); public static PlayerInfo LocalPlayer => GetPlayer(LocalPlayerId);
public static List<PlayerInfo> PlayerList { get; } = new List<PlayerInfo>(); public static List<PlayerInfo> PlayerList { get; } = new();
private static readonly List<PlayerSyncObject> PlayerSyncObjects = new(); private static readonly List<PlayerSyncObject> PlayerSyncObjects = new();
public static PlayerInfo GetPlayer(uint id) public static PlayerInfo GetPlayer(uint id)
{ {
if (id is uint.MaxValue or 0U) if (id is uint.MaxValue or 0)
{ {
return default; return default;
} }
@ -74,7 +68,7 @@ namespace QSB.Player
} }
public static bool PlayerExists(uint id) => public static bool PlayerExists(uint id) =>
id != uint.MaxValue && PlayerList.Any(x => x.PlayerId == id); id is not (uint.MaxValue or 0) && PlayerList.Any(x => x.PlayerId == id);
public static IEnumerable<T> GetSyncObjects<T>() where T : PlayerSyncObject => public static IEnumerable<T> GetSyncObjects<T>() where T : PlayerSyncObject =>
PlayerSyncObjects.OfType<T>().Where(x => x != null); PlayerSyncObjects.OfType<T>().Where(x => x != null);

17
QSB/Utility/Extensions.cs
View File

@ -1,6 +1,5 @@
using OWML.Common; using OWML.Common;
using QSB.Player; using QSB.Player;
using QSB.Player.TransformSync;
using QuantumUNET; using QuantumUNET;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -48,21 +47,7 @@ namespace QSB.Utility
return uint.MaxValue; return uint.MaxValue;
} }
var go = playerController.Gameobject; return playerController.UnetView.NetId.Value;
if (go == null)
{
DebugLog.ToConsole($"Error - GameObject of {playerController.UnetView.NetId.Value} is null.", MessageType.Error);
return uint.MaxValue;
}
var controller = go.GetComponent<PlayerTransformSync>();
if (controller == null)
{
DebugLog.ToConsole($"Error - No PlayerTransformSync found on {go.name}", MessageType.Error);
return uint.MaxValue;
}
return controller.NetId.Value;
} }
public static void SpawnWithServerAuthority(this GameObject go) public static void SpawnWithServerAuthority(this GameObject go)