cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes Electrocutions to use available power, not consumed power (#24554) 

-Electrocutions now happen using how much power there is rather than how much is being used.

(cherry picked from commit cdfff3c4bd49f77d9711d590eb649e365c3bca91)
This commit is contained in:
Varen 2024-02-01 12:54:24 +01:00 committed by Debug
parent adddd74cff
commit b828d35d76
No known key found for this signature in database
GPG Key ID: 271270A74EF9C350
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Electrocution/ElectrocutionSystem.cs
View File

@ -258,7 +258,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
return false;
var net = powerNet.NetworkNode;
var supp = net.LastCombinedSupply;
var supp = net.LastCombinedMaxSupply;
if (supp <= 0f)
return false;
@ -295,7 +295,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
{
if (id != null &&
_nodeContainer.TryGetNode<Node>(nodeContainer, id, out var tryNode) &&
tryNode.NodeGroup is IBasePowerNet { NetworkNode: { LastCombinedSupply: > 0 } })
tryNode.NodeGroup is IBasePowerNet { NetworkNode: { LastCombinedMaxSupply: > 0 } })
{
return tryNode;
}