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

do _startIlluminated checks in worldobject and not in Start

Browse Source
This commit is contained in:
JohnCorby 2022-07-24 14:55:13 -07:00
parent b1810c413e
commit 0efd04fd70
3 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ using QSB.Patches;
using QSB.WorldSync;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
/*
* For those who come here,
@ -19,6 +20,52 @@ internal class LightSensorPatches : QSBPatch
{
public override QSBPatchTypes Type => QSBPatchTypes.OnClientConnect;
[HarmonyPrefix]
[HarmonyPatch(nameof(SingleLightSensor.Start))]
private static bool Start(SingleLightSensor __instance)
{
if (__instance._lightDetector != null)
{
__instance._lightSources = new List<ILightSource>();
__instance._lightSourceMask = LightSourceType.VOLUME_ONLY;
if (__instance._detectFlashlight)
{
__instance._lightSourceMask |= LightSourceType.FLASHLIGHT;
}
if (__instance._detectProbe)
{
__instance._lightSourceMask |= LightSourceType.PROBE;
}
if (__instance._detectDreamLanterns)
{
__instance._lightSourceMask |= LightSourceType.DREAM_LANTERN;
}
if (__instance._detectSimpleLanterns)
{
__instance._lightSourceMask |= LightSourceType.SIMPLE_LANTERN;
}
__instance._lightDetector.OnLightVolumeEnter += __instance.OnLightSourceEnter;
__instance._lightDetector.OnLightVolumeExit += __instance.OnLightSourceExit;
}
else
{
Debug.LogError("LightSensor has no LightSourceDetector", __instance);
}
if (__instance._sector != null)
{
__instance.enabled = false;
__instance._lightDetector.GetShape().enabled = false;
// dont do _startIlluminated stuff here since its done in the worldobject
}
return false;
}
[HarmonyPrefix]
[HarmonyPatch(nameof(SingleLightSensor.OnSectorOccupantsUpdated))]
private static bool OnSectorOccupantsUpdated(SingleLightSensor __instance)

5
QSB/EchoesOfTheEye/LightSensorSync/QSBPlayerLightSensor.cs
View File

@ -35,14 +35,13 @@ public class QSBPlayerLightSensor : MonoBehaviour
RequestInitialStatesMessage.SendInitialState += SendInitialState;
QSBPlayerManager.OnRemovePlayer += OnPlayerLeave;
// normally done in Start, but world objects arent ready by that point
if (_lightSensor._sector != null)
{
if (_lightSensor._startIlluminated)
{
_locallyIlluminated = true;
// do it manually so as not to invoke OnDetectLight, since that's handled by Start
// BUG? should add all players to the list, not just local
_illuminatedBy.SafeAdd(PlayerId);
new PlayerSetIlluminatedMessage(PlayerId, true).Send();
}
}
}

5
QSB/EchoesOfTheEye/LightSensorSync/WorldObjects/QSBLightSensor.cs
View File

@ -36,15 +36,14 @@ internal class QSBLightSensor : WorldObject<SingleLightSensor>
{
QSBPlayerManager.OnRemovePlayer += OnPlayerLeave;
// normally done in Start, but world objects arent ready by that point
if (AttachedObject._sector != null)
{
if (AttachedObject._startIlluminated)
{
_locallyIlluminated = true;
OnDetectLocalLight?.Invoke();
// do it manually so as not to invoke OnDetectLight, since that's handled by Start
// BUG? should add all players to the list, not just local
_illuminatedBy.SafeAdd(QSBPlayerManager.LocalPlayerId);
this.SendMessage(new SetIlluminatedMessage(true));
}
}
}