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

Merge branch 'dev' into nh-stuff

Browse Source
This commit is contained in:
JohnCorby 2022-10-11 01:06:57 -07:00
commit 66976ff28f
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QSB/EchoesOfTheEye/VisionTorch/Messages/VisionTorchProjectMessage.cs
View File

@ -10,7 +10,8 @@ public class VisionTorchProjectMessage : QSBWorldObjectMessage<QSBVisionTorchIte
public override void OnReceiveRemote()
{
WorldObject.AttachedObject._isProjecting = Data;
WorldObject.IsProjectingRemotely = Data;
WorldObject.AttachedObject._mindProjectorTrigger.SetProjectorActive(Data);
// prevent the torch from actually doing things remotely
WorldObject.AttachedObject.mindProjectorTrigger._triggerVolume.SetTriggerActivation(false);
}
}

18
QSB/EchoesOfTheEye/VisionTorch/Patches/VisionTorchPatches.cs
View File

@ -42,22 +42,4 @@ public class VisionTorchPatches : QSBPatch
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(MindProjectorTrigger), nameof(MindProjectorTrigger.OnTriggerVolumeEntry))]
private static bool OnTriggerVolumeEntry(MindProjectorTrigger __instance)
{
if (!QSBWorldSync.AllObjectsReady)
{
return true;
}
var visionTorchItem = __instance.GetComponentInParent<VisionTorchItem>();
if (visionTorchItem && visionTorchItem.GetWorldObject<QSBVisionTorchItem>().IsProjectingRemotely)
{
return false;
}
return true;
}
}

2
QSB/EchoesOfTheEye/VisionTorch/WorldObjects/QSBVisionTorchItem.cs
View File

@ -6,8 +6,6 @@ namespace QSB.EchoesOfTheEye.VisionTorch.WorldObjects;
public class QSBVisionTorchItem : QSBItem<VisionTorchItem>
{
public bool IsProjectingRemotely;
public override void SendInitialState(uint to)
{
this.SendMessage(new VisionTorchProjectMessage(AttachedObject._isProjecting) { To = to });