Gittes-archive/quantum-space-buddies
2
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-12-11 20:15:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #717 from qsb-dev/nh-quantum-compat

Browse Source 
Fix NH quantum objects having no ControllingPlayer if they are near spawn
This commit is contained in:
Will Corby 2025-03-01 19:40:28 -08:00 committed by GitHub
commit c90d3345e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
View File

@ -71,6 +71,15 @@ public abstract class QSBQuantumObject<T> : WorldObject<T>, IQSBQuantumObject
if (attachedShapes.All(x => x.enabled && x.gameObject.activeInHierarchy && x.active)) if (attachedShapes.All(x => x.enabled && x.gameObject.activeInHierarchy && x.active))
{ {
IsEnabled = true; IsEnabled = true;
// If the shapes are already enabled then OnShapeActivated won't get triggered until it turns off and on again
// Then nobody ends up controlling the object until that happens
// This doesn't affect base game because there are no quantum objects at spawn, but can affect NH mods
// In this case where the host has spawned in and the object is enabled with no ControllingPlayer, the host should take control
if (QSBCore.IsHost)
{
// first player is the host
ControllingPlayer = QSBPlayerManager.PlayerList[0].PlayerId;
}
} }
else else
{ {

10
QSB/QuantumSync/WorldObjects/QSBSocketedQuantumObject.cs
View File

@ -1,6 +1,8 @@
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using OWML.Common; using OWML.Common;
using QSB.Messaging;
using QSB.Player; using QSB.Player;
using QSB.QuantumSync.Messages;
using QSB.Utility; using QSB.Utility;
using QSB.WorldSync; using QSB.WorldSync;
using System; using System;
@ -35,7 +37,13 @@ public class QSBSocketedQuantumObject : QSBQuantumObject<SocketedQuantumObject>
{ {
base.SendInitialState(to); base.SendInitialState(to);
// todo SendInitialState if (this.ControllingPlayer != 0 && AttachedObject._occupiedSocket != null)
{
this.SendMessage(new SocketStateChangeMessage(
AttachedObject._occupiedSocket.GetWorldObject<QSBQuantumSocket>().ObjectId,
AttachedObject.transform.localRotation)
{ To = to });
}
} }
public void MoveToSocket(uint playerId, int socketId, Quaternion localRotation) public void MoveToSocket(uint playerId, int socketId, Quaternion localRotation)

2
README.md
View File

@ -114,7 +114,7 @@ See the [QSB Developer Wiki](https://github.com/qsb-dev/quantum-space-buddies/wi
### Contributers ### Contributers
- [xen](https://github.com/xen-42) - Help with syncing particle/sound effects, fixing lantern item bugs, and syncing addon data. - [xen](https://github.com/xen-42) - Help with syncing particle/sound effects, fixing lantern item bugs, syncing addon data, and NH compatibility/bug fixes.
- [Moonstone](https://github.com/MoonstoneStudios) - Improvements to elevators and lifts. - [Moonstone](https://github.com/MoonstoneStudios) - Improvements to elevators and lifts.
- [Chris Yeninas](https://github.com/PhantomGamers) - Help with project files and GitHub workflows. - [Chris Yeninas](https://github.com/PhantomGamers) - Help with project files and GitHub workflows.
- [Locochoco](https://github.com/loco-choco) - Code improvements. - [Locochoco](https://github.com/loco-choco) - Code improvements.