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

Merge branch 'dev' of https://github.com/misternebula/quantum-space-buddies into dev

Browse Source
This commit is contained in:
Mister_Nebula 2022-08-24 08:15:51 +01:00
commit ca42319262
5 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
QSB/EchoesOfTheEye/LightSensorSync/Patches/LightSensorPatches.cs
View File

@ -111,6 +111,11 @@ internal class LightSensorPatches : QSBPatch
_illuminatingDreamLanternList.AddRange(__instance._illuminatingDreamLanternList); _illuminatingDreamLanternList.AddRange(__instance._illuminatingDreamLanternList);
} }
__instance.UpdateIllumination(); __instance.UpdateIllumination();
if (__instance._illuminatingDreamLanternList != null &&
!__instance._illuminatingDreamLanternList.SequenceEqual(_illuminatingDreamLanternList))
{
qsbLightSensor.SendMessage(new IlluminatingLanternsMessage(__instance._illuminatingDreamLanternList));
}
if (!illuminated && __instance._illuminated) if (!illuminated && __instance._illuminated)
{ {
__instance.OnDetectLight.Invoke(); __instance.OnDetectLight.Invoke();
@ -121,11 +126,6 @@ internal class LightSensorPatches : QSBPatch
__instance.OnDetectDarkness.Invoke(); __instance.OnDetectDarkness.Invoke();
qsbLightSensor.SendMessage(new SetIlluminatedMessage(false)); qsbLightSensor.SendMessage(new SetIlluminatedMessage(false));
} }
if (__instance._illuminatingDreamLanternList != null &&
!__instance._illuminatingDreamLanternList.SequenceEqual(_illuminatingDreamLanternList))
{
qsbLightSensor.SendMessage(new IlluminatingLanternsMessage(__instance._illuminatingDreamLanternList));
}
} }
var locallyIlluminated = qsbLightSensor._locallyIlluminated; var locallyIlluminated = qsbLightSensor._locallyIlluminated;
@ -165,6 +165,11 @@ internal class LightSensorPatches : QSBPatch
_illuminatingDreamLanternList.AddRange(__instance._illuminatingDreamLanternList); _illuminatingDreamLanternList.AddRange(__instance._illuminatingDreamLanternList);
} }
__instance.UpdateIllumination(); __instance.UpdateIllumination();
if (__instance._illuminatingDreamLanternList != null &&
!__instance._illuminatingDreamLanternList.SequenceEqual(_illuminatingDreamLanternList))
{
new PlayerIlluminatingLanternsMessage(QSBPlayerManager.LocalPlayerId, __instance._illuminatingDreamLanternList).Send();
}
if (!illuminated && __instance._illuminated) if (!illuminated && __instance._illuminated)
{ {
__instance.OnDetectLight.Invoke(); __instance.OnDetectLight.Invoke();
@ -175,11 +180,6 @@ internal class LightSensorPatches : QSBPatch
__instance.OnDetectDarkness.Invoke(); __instance.OnDetectDarkness.Invoke();
new PlayerSetIlluminatedMessage(QSBPlayerManager.LocalPlayerId, false).Send(); new PlayerSetIlluminatedMessage(QSBPlayerManager.LocalPlayerId, false).Send();
} }
if (__instance._illuminatingDreamLanternList != null &&
!__instance._illuminatingDreamLanternList.SequenceEqual(_illuminatingDreamLanternList))
{
new PlayerIlluminatingLanternsMessage(QSBPlayerManager.LocalPlayerId, __instance._illuminatingDreamLanternList).Send();
}
return false; return false;
} }

6
QSB/EchoesOfTheEye/RaftSync/TransformSync/RaftTransformSync.cs
View File

@ -10,7 +10,7 @@ namespace QSB.EchoesOfTheEye.RaftSync.TransformSync;
public class RaftTransformSync : UnsectoredRigidbodySync, ILinkedNetworkBehaviour public class RaftTransformSync : UnsectoredRigidbodySync, ILinkedNetworkBehaviour
{ {
protected override bool UseInterpolation => Locator.GetPlayerController().GetGroundBody() != AttachedRigidbody; /*TODO: test that this doesnt NRE*/ protected override bool UseInterpolation => Locator.GetPlayerController().GetGroundBody() != AttachedRigidbody;
private float _lastSetPositionTime; private float _lastSetPositionTime;
private const float ForcePositionAfterTime = 1; private const float ForcePositionAfterTime = 1;
@ -74,8 +74,8 @@ public class RaftTransformSync : UnsectoredRigidbodySync, ILinkedNetworkBehaviou
/// </summary> /// </summary>
protected override void ApplyToAttached() protected override void ApplyToAttached()
{ {
var targetPos = ReferenceTransform.FromRelPos(transform.position); var targetPos = ReferenceTransform.FromRelPos(UseInterpolation ? SmoothPosition : transform.position);
var targetRot = ReferenceTransform.FromRelRot(transform.rotation); var targetRot = ReferenceTransform.FromRelRot(UseInterpolation ? SmoothRotation : transform.rotation);
var onRaft = Locator.GetPlayerController().GetGroundBody() == AttachedRigidbody; var onRaft = Locator.GetPlayerController().GetGroundBody() == AttachedRigidbody;
if (onRaft) if (onRaft)

1
QSB/Player/QSBPlayerManager.cs
View File

@ -131,6 +131,7 @@ public static class QSBPlayerManager
public static IEnumerator ValidatePlayers() public static IEnumerator ValidatePlayers()
{ {
// BUG: this does not work. try using a ping (heartbeat) message to detect whether the player actually exists. if they dont, kick the player.
while (true) while (true)
{ {
if (QSBCore.IsInMultiplayer && QSBCore.IsHost) if (QSBCore.IsInMultiplayer && QSBCore.IsHost)

31
QSB/Player/TransformSync/PlayerTransformSync.cs
View File

@ -29,25 +29,8 @@ public class PlayerTransformSync : SectoredTransformSync
private Transform _visibleStickTip; private Transform _visibleStickTip;
private Transform _networkStickTip => _networkStickPivot.GetChild(0); private Transform _networkStickTip => _networkStickPivot.GetChild(0);
private bool _hasRanOnStartClient;
public override void OnStartClient() public override void OnStartClient()
{ {
if (_hasRanOnStartClient)
{
DebugLog.ToConsole($"ERROR - OnStartClient is being called AGAIN for {Player.PlayerId}'s PlayerTransformSync!", MessageType.Error);
return;
}
_hasRanOnStartClient = true;
if (QSBPlayerManager.PlayerList.Any(x => x.TransformSync == this))
{
// this really shouldnt happen...
DebugLog.ToConsole($"Error - A PlayerInfo already exists with TransformSync {name}", MessageType.Error);
Destroy(gameObject); // probably bad
return;
}
var player = new PlayerInfo(this); var player = new PlayerInfo(this);
QSBPlayerManager.PlayerList.SafeAdd(player); QSBPlayerManager.PlayerList.SafeAdd(player);
base.OnStartClient(); base.OnStartClient();
@ -57,19 +40,7 @@ public class PlayerTransformSync : SectoredTransformSync
JoinLeaveSingularity.Create(Player, true); JoinLeaveSingularity.Create(Player, true);
} }
public override void OnStartLocalPlayer() public override void OnStartLocalPlayer() => LocalInstance = this;
{
if (LocalInstance != null)
{
DebugLog.ToConsole($"ERROR - LocalInstance is already non-null in OnStartLocalPlayer!", MessageType.Error);
Destroy(gameObject); // probably bad
return;
}
LocalInstance = this;
}
public override void OnStopLocalPlayer() => LocalInstance = null;
public override void OnStopClient() public override void OnStopClient()
{ {

6
QSB/ShipSync/TransformSync/ShipTransformSync.cs
View File

@ -56,8 +56,8 @@ public class ShipTransformSync : SectoredRigidbodySync
return; return;
} }
var targetPos = ReferenceTransform.FromRelPos(transform.position); var targetPos = ReferenceTransform.FromRelPos(UseInterpolation ? SmoothPosition : transform.position);
var targetRot = ReferenceTransform.FromRelRot(transform.rotation); var targetRot = ReferenceTransform.FromRelRot(UseInterpolation ? SmoothRotation : transform.rotation);
if (PlayerState.IsInsideShip()) if (PlayerState.IsInsideShip())
{ {
@ -98,5 +98,5 @@ public class ShipTransformSync : SectoredRigidbodySync
rigidbody._currentVelocity = newVelocity; rigidbody._currentVelocity = newVelocity;
} }
protected override bool UseInterpolation => !PlayerState.IsInsideShip(); /*TODO: test that this doesnt NRE*/ protected override bool UseInterpolation => !PlayerState.IsInsideShip();
} }