tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix load & supply desync upon merging powernets.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2018-05-30 16:22:51 +02:00
parent ff0b1bfd05
commit 179b2534d2
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/Components/Power/Powernet.cs
View File

@@ -234,12 +234,16 @@ namespace Content.Server.GameObjects.Components.Power
{ {
GeneratorList.Add(generator.Key, generator.Value); GeneratorList.Add(generator.Key, generator.Value);
} }
Supply += toMerge.Supply;
toMerge.Supply = 0;
toMerge.GeneratorList.Clear(); toMerge.GeneratorList.Clear();
foreach (var device in toMerge.DeviceLoadList) foreach (var device in toMerge.DeviceLoadList)
{ {
DeviceLoadList.Add(device); DeviceLoadList.Add(device);
} }
Load += toMerge.Load;
toMerge.Load = 0;
toMerge.DeviceLoadList.Clear(); toMerge.DeviceLoadList.Clear();
DepoweredDevices.AddRange(toMerge.DepoweredDevices); DepoweredDevices.AddRange(toMerge.DepoweredDevices);