mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-30 12:32:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-qm-killer' into message-manager

Browse Source
This commit is contained in:
JohnCorby 2021-12-19 21:18:12 -08:00
commit c0e919781d
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
QSB/Player/Events/RequestStateResyncEvent.cs
View File

@ -12,6 +12,7 @@ using QSB.Tools.TranslatorTool.TranslationSync.WorldObjects;
using QSB.TornadoSync.WorldObjects; using QSB.TornadoSync.WorldObjects;
using QSB.Utility; using QSB.Utility;
using QSB.WorldSync; using QSB.WorldSync;
using UnityEngine;
namespace QSB.Player.Events namespace QSB.Player.Events
{ {
@ -113,8 +114,30 @@ namespace QSB.Player.Events
=> QSBEventManager.FireEvent(EventNames.QSBTextTranslated, NomaiTextType.VesselComputer, vesselComputer.ObjectId, id)); => QSBEventManager.FireEvent(EventNames.QSBTextTranslated, NomaiTextType.VesselComputer, vesselComputer.ObjectId, id));
} }
QSBWorldSync.GetWorldObjects<IQSBQuantumObject>().ForEach(x QSBWorldSync.GetWorldObjects<IQSBQuantumObject>().ForEach(x =>
=> QSBEventManager.FireEvent(EventNames.QSBQuantumAuthority, x.ObjectId, x.ControllingPlayer)); {
QSBEventManager.FireEvent(EventNames.QSBQuantumAuthority, x.ObjectId, x.ControllingPlayer);
if (x is QSBQuantumMoon qsbQuantumMoon)
{
int stateIndex;
Vector3 onUnitSphere;
int orbitAngle;
var moon = qsbQuantumMoon.AttachedObject;
var moonBody = moon._moonBody;
stateIndex = moon.GetStateIndex();
var orbit = moon._orbits.First(y => y.GetStateIndex() == stateIndex);
var orbitBody = orbit.GetAttachedOWRigidbody();
var relPos = moonBody.GetWorldCenterOfMass() - orbitBody.GetWorldCenterOfMass();
var relVel = moonBody.GetVelocity() - orbitBody.GetVelocity();
onUnitSphere = relPos.normalized;
var perpendicular = Vector3.Cross(relPos, Vector3.up).normalized;
orbitAngle = (int)OWMath.WrapAngle(OWMath.Angle(perpendicular, relVel, relPos));
QSBEventManager.FireEvent(EventNames.QSBMoonStateChange, stateIndex, onUnitSphere, orbitAngle);
}
});
QSBWorldSync.GetWorldObjects<QSBCampfire>().ForEach(campfire QSBWorldSync.GetWorldObjects<QSBCampfire>().ForEach(campfire
=> QSBEventManager.FireEvent(EventNames.QSBCampfireState, campfire.ObjectId, campfire.GetState())); => QSBEventManager.FireEvent(EventNames.QSBCampfireState, campfire.ObjectId, campfire.GetState()));

4
QSB/QuantumSync/WorldObjects/QSBEyeProxyQuantumMoon.cs
View File

@ -1,4 +1,5 @@
using QSB.Player; using QSB.Player;
using System.Linq;
namespace QSB.QuantumSync.WorldObjects namespace QSB.QuantumSync.WorldObjects
{ {
@ -6,7 +7,8 @@ namespace QSB.QuantumSync.WorldObjects
{ {
public override void Init() public override void Init()
{ {
ControllingPlayer = QSBPlayerManager.LocalPlayerId; // smallest player id is the host
ControllingPlayer = QSBPlayerManager.PlayerList.Min(x => x.PlayerId);
base.Init(); base.Init();
} }
} }

5
QSB/QuantumSync/WorldObjects/QSBQuantumMoon.cs
View File

@ -7,9 +7,8 @@ namespace QSB.QuantumSync.WorldObjects
{ {
public override void Init() public override void Init()
{ {
ControllingPlayer = QSBCore.IsHost // smallest player id is the host
? QSBPlayerManager.LocalPlayerId ControllingPlayer = QSBPlayerManager.PlayerList.Min(x => x.PlayerId);
: QSBPlayerManager.PlayerList.OrderBy(x => x.PlayerId).First().PlayerId;
base.Init(); base.Init();
} }
} }