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

help

Browse Source
This commit is contained in:
Mister_Nebula 2021-12-11 20:06:02 +00:00
parent 65ec923e33
commit d9e250d191
4 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
QSB/Animation/Player/AnimationSync.cs
View File

@ -269,14 +269,28 @@ namespace QSB.Animation.Player
if (type is not AnimationType.PlayerSuited and not AnimationType.PlayerUnsuited)
{
VisibleAnimator?.SetTrigger("Playing");
InvisibleAnimator?.SetTrigger("Playing");
if (VisibleAnimator != null)
{
VisibleAnimator.SetTrigger("Playing");
}
if (InvisibleAnimator != null)
{
InvisibleAnimator.SetTrigger("Playing");
}
}
else
{
// Avoids "jumping" when exiting instrument and putting on suit
VisibleAnimator?.SetTrigger("Grounded");
InvisibleAnimator?.SetTrigger("Grounded");
if (VisibleAnimator != null)
{
VisibleAnimator.SetTrigger("Grounded");
}
if (InvisibleAnimator != null)
{
InvisibleAnimator.SetTrigger("Grounded");
}
}
if (NetworkAnimator == null)

6
QSB/Events/QSBEvent.cs
View File

@ -1,5 +1,6 @@
using OWML.Common;
using QSB.ClientServerStateSync;
using QSB.ClientServerStateSync.Events;
using QSB.Messaging;
using QSB.Player;
using QSB.Player.Events;
@ -98,7 +99,10 @@ namespace QSB.Events
if (!player.IsReady
&& player.PlayerId != LocalPlayerId
&& player.State is ClientState.AliveInSolarSystem or ClientState.AliveInEye or ClientState.DeadInSolarSystem
&& this is not PlayerInformationEvent and not PlayerReadyEvent and not RequestStateResyncEvent)
&& this is not PlayerInformationEvent
and not PlayerReadyEvent
and not RequestStateResyncEvent
and not ServerStateEvent)
{
DebugLog.ToConsole($"Warning - Got message (type:{GetType().Name}) from player {message.FromId}, but they were not ready. Asking for state resync, just in case.", MessageType.Warning);
QSBEventManager.FireEvent(EventNames.QSBRequestStateResync);

6
QSB/Player/PlayerInfo.cs
View File

@ -197,6 +197,12 @@ namespace QSB.Player
public void UpdateObjectsFromStates()
{
if (OWInput.GetInputMode() == InputMode.None)
{
// ? why is this here lmao
return;
}
if (CameraBody == null)
{
return;
}

6
QSB/TimeSync/WakeUpSync.cs
View File

@ -155,7 +155,6 @@ namespace QSB.TimeSync
if (ServerStateManager.Instance.GetServerState() is not ServerState.InSolarSystem and not ServerState.InEye)
{
DebugLog.ToConsole($"nah serverstate:{ServerStateManager.Instance.GetServerState()} (Target:{_serverTime} Current:{Time.timeSinceLevelLoad})");
return;
}
@ -358,11 +357,6 @@ namespace QSB.TimeSync
StartPausing(PauseReason.WaitingForAllPlayersToBeReady);
}
if (serverState == ServerState.InSolarSystem && (clientState == ClientState.WaitingForOthersToReadyInSolarSystem || clientState == ClientState.WaitingForOthersToDieInSolarSystem))
{
DebugLog.DebugWrite($"Server is still running game normally, but this player has died from an accepted death!", MessageType.Warning);
}
if (serverState == ServerState.WaitingForAllPlayersToDie && clientState == ClientState.WaitingForOthersToReadyInSolarSystem)
{
StartPausing(PauseReason.WaitingForAllPlayersToBeReady);