This commit is contained in:
Mister_Nebula 2021-03-25 22:01:10 +00:00
parent cec8249615
commit 85b800d120
8 changed files with 10 additions and 23 deletions

View File

@ -102,8 +102,8 @@ namespace QSB.ConversationSync.Patches
else
{
var player = QSBPlayerManager.GetPlayer(playerId);
position = player.CameraBody == null
? Locator.GetActiveCamera().transform.position
position = player.CameraBody == null
? Locator.GetActiveCamera().transform.position
: player.CameraBody.transform.position;
}
var localPosition = ____animator.transform.InverseTransformPoint(position);

View File

@ -2,7 +2,7 @@
namespace QSB.GeyserSync.Patches
{
class GeyserPatches : QSBPatch
internal class GeyserPatches : QSBPatch
{
public override QSBPatchTypes Type => QSBPatchTypes.OnClientConnect;

View File

@ -31,10 +31,7 @@ namespace QSB.ItemSync.WorldObjects
QSBPlayerManager.OnRemovePlayer += OnPlayerLeave;
}
public override void OnRemoval()
{
QSBPlayerManager.OnRemovePlayer -= OnPlayerLeave;
}
public override void OnRemoval() => QSBPlayerManager.OnRemovePlayer -= OnPlayerLeave;
private void OnPlayerLeave(uint player)
{

View File

@ -1,5 +1,4 @@
using OWML.Common;
using OWML.Utils;
using QSB.OrbSync.WorldObjects;
using QSB.Utility;
using QSB.WorldSync;

View File

@ -105,7 +105,7 @@ namespace QSB.Player
public static List<PlayerInfo> GetPlayersWithCameras(bool includeLocalCamera = true)
{
var cameraList = PlayerList.Where(x => x.Camera != null && x.PlayerId != LocalPlayerId).ToList();
if (includeLocalCamera
if (includeLocalCamera
&& LocalPlayer != default
&& LocalPlayer.Camera != null)
{

View File

@ -2,19 +2,11 @@
using OWML.Utils;
using QSB.Animation;
using QSB.DeathSync;
using QSB.ElevatorSync.WorldObjects;
using QSB.Events;
using QSB.GeyserSync.WorldObjects;
using QSB.Instruments;
using QSB.ItemSync;
using QSB.ItemSync.WorldObjects;
using QSB.OrbSync;
using QSB.OrbSync.WorldObjects;
using QSB.Patches;
using QSB.Player;
using QSB.QuantumSync;
using QSB.SectorSync;
using QSB.SectorSync.WorldObjects;
using QSB.TimeSync;
using QSB.TransformSync;
using QSB.Utility;

View File

@ -310,8 +310,8 @@ namespace QSB.QuantumSync.Patches
return false;
}
if (QSBPlayerManager.LocalPlayer != null
&& QSBPlayerManager.LocalPlayer.IsInShrine
if (QSBPlayerManager.LocalPlayer != null
&& QSBPlayerManager.LocalPlayer.IsInShrine
&& PlayerState.IsFlashlightOn())
{
__result = false;

View File

@ -1,14 +1,13 @@
using QSB.Utility;
using System.Collections.Generic;
using System.Collections.Generic;
using UnityEngine;
namespace QSB.WorldSync
{
public abstract class WorldObjectManager : MonoBehaviour
{
private static List<WorldObjectManager> _managers = new List<WorldObjectManager>();
private static readonly List<WorldObjectManager> _managers = new List<WorldObjectManager>();
public virtual void Awake()
public virtual void Awake()
=> _managers.Add(this);
public virtual void OnDestroy()