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

?

Browse Source
This commit is contained in:
Mister_Nebula 2020-08-17 21:28:38 +01:00
parent 5bf088f609
commit 4e1eca8bff
7 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QSB/Animation/AnimationSync.cs
View File

@ -127,8 +127,7 @@ namespace QSB.Animation
{
var message = new AnimTriggerMessage
{
FromId = netId.Value,
AboutId = netId.Value,
AboutId = PlayerRegistry.LocalPlayerId,
TriggerId = (short)trigger,
Value = value
};

3
QSB/Events/PlayerState.cs
View File

@ -20,7 +20,7 @@ namespace QSB.Events
private void OnClientReceiveMessage(PlayerStateMessage message)
{
if (message.FromId == PlayerRegistry.LocalPlayerId)
if (PlayerRegistry.IsBelongingToLocalPlayer(message.AboutId))
{
return;
}
@ -34,7 +34,6 @@ namespace QSB.Events
{
var message = new PlayerStateMessage
{
FromId = PlayerRegistry.LocalPlayerId,
AboutId = player.NetId,
PlayerName = player.Name,
PlayerReady = player.IsReady,

2
QSB/PlayerInfo.cs
View File

@ -12,7 +12,7 @@ namespace QSB
public GameObject Camera { get; set; }
public GameObject ProbeBody { get; set; }
public QSBProbe Probe { get; set; }
public QSBFlashlight FlashLight => Camera.GetComponentInChildren<QSBFlashlight>();
public QSBFlashlight FlashLight => Camera?.GetComponentInChildren<QSBFlashlight>();
public QSBTool Signalscope => GetToolByType(ToolType.Signalscope);
public QSBTool Translator => GetToolByType(ToolType.Translator);
public QSBTool ProbeLauncher => GetToolByType(ToolType.ProbeLauncher);

2
QSB/PlayerRegistry.cs
View File

@ -3,7 +3,6 @@ using System.Linq;
using QSB.TransformSync;
using QSB.Animation;
using QSB.Messaging;
using QSB.Utility;
namespace QSB
{
@ -32,7 +31,6 @@ namespace QSB
public static void RemovePlayer(uint id)
{
DebugLog.ToConsole($"Removing player {id}");
PlayerList.Remove(GetPlayer(id));
}

2
QSB/TransformSync/PlayerSectorEvent.cs
View File

@ -42,7 +42,7 @@ namespace QSB.TransformSync
}
var transformSync = PlayerRegistry.GetTransformSync(message.AboutId);
//DebugLog.ToConsole($"{transformSync.GetType().Name} of ID {message.SenderId} set to {sector.Name}");
//DebugLog.ToConsole($"{transformSync.GetType().Name} of ID {message.AboutId} set to {sector.Name}");
UnityHelper.Instance.RunWhen(() => transformSync.SyncedTransform != null,
() => transformSync.SetReferenceSector(sector));
}

9
QSB/TransformSync/PlayerTransformSync.cs
View File

@ -1,5 +1,4 @@
using QSB.Animation;
using QSB.Utility;
using UnityEngine;
namespace QSB.TransformSync
@ -10,19 +9,11 @@ namespace QSB.TransformSync
static PlayerTransformSync()
{
DebugLog.ToConsole("constructor of playertransformsync");
AnimControllerPatch.Init();
}
public override void OnNetworkDestroy()
{
DebugLog.ToConsole("PlayerTransformSync on network destroy");
base.OnNetworkDestroy();
}
public override void OnStartLocalPlayer()
{
DebugLog.ToConsole("onstartlocalplayer of playertransformsync, id of " + PlayerId);
LocalInstance = this;
}

9
QSB/TransformSync/TransformSync.cs
View File

@ -22,7 +22,6 @@ namespace QSB.TransformSync
protected virtual void Awake()
{
DebugLog.ToConsole($"Adding {GetType().Name} of id {netId.Value} to transformsync list.");
PlayerRegistry.TransformSyncs.Add(this);
DontDestroyOnLoad(gameObject);
QSBSceneManager.OnSceneLoaded += OnSceneLoaded;
@ -88,12 +87,14 @@ namespace QSB.TransformSync
// If this script is attached to any other body, eg the representations of other players
if (SyncedTransform.position == Vector3.zero)
{
// Fix bodies staying at 0,0,0 by chucking them into the sun
DebugLog.ToConsole($"{GetType().Name} of id {PlayerId} is at 0,0,0!");
Hide();
return;
}
else
{
Show();
}
Show();
SyncedTransform.localPosition = Vector3.SmoothDamp(SyncedTransform.localPosition, transform.position, ref _positionSmoothVelocity, SmoothTime);
SyncedTransform.localRotation = QuaternionHelper.SmoothDamp(SyncedTransform.localRotation, transform.rotation, ref _rotationSmoothVelocity, Time.deltaTime);
}