Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Fix UninitializedSaveTest prototypes" (#16169)

Browse Source 
This reverts commit 9094727842.
This commit is contained in:
AJCM-git
2023-05-06 10:50:45 -04:00
committed by GitHub
parent c1dfb43c7d
commit de1613f7ef
25 changed files with 103 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Content.Server/Lightning/LightningSystem.cs
View File

@@ -37,28 +37,28 @@ public sealed class LightningSystem : SharedLightningSystem
private void OnCollide(EntityUid uid, LightningComponent component, ref StartCollideEvent args)
{
if (!TryComp<BeamComponent>(uid, out var lightningBeam)
|| !TryComp<BeamComponent>(lightningBeam.VirtualBeamController, out var beamController))
if (!TryComp<BeamComponent>(uid, out var lightningBeam) || !TryComp<BeamComponent>(lightningBeam.VirtualBeamController, out var beamController))
{
return;
}
if (!component.CanArc && beamController.CreatedBeams.Count < component.MaxTotalArcs)
return;
if (component.CanArc)
{
while (beamController.CreatedBeams.Count < component.MaxTotalArcs)
{
Arc(component, args.OtherFixture.Body.Owner, lightningBeam.VirtualBeamController.Value);
Arc(component, args.OtherEntity, lightningBeam.VirtualBeamController.Value);
var spriteState = LightningRandomizer();
if (component.ArcTarget == null)
return;
component.ArcTargets.Add(args.OtherFixture.Body.Owner);
component.ArcTargets.Add(component.ArcTarget);
var spriteState = LightningRandomizer();
component.ArcTargets.Add(args.OtherEntity);
component.ArcTargets.Add(component.ArcTarget.Value);
_beam.TryCreateBeam(args.OtherFixture.Body.Owner, component.ArcTarget, component.LightningPrototype, spriteState, controller: lightningBeam.VirtualBeamController.Value);
_beam.TryCreateBeam(
args.OtherEntity,
component.ArcTarget.Value,
component.LightningPrototype,
spriteState,
controller: lightningBeam.VirtualBeamController.Value);
//Break from this loop so other created bolts can collide and arc
break;
}
}
}
/// <summary>