Fix load & supply desync upon merging powernets.

2018-05-30 16:22:51 +02:00
parent ff0b1bfd05
commit 179b2534d2
1 changed files with 4 additions and 0 deletions
--- a/Content.Server/GameObjects/Components/Power/Powernet.cs
+++ b/Content.Server/GameObjects/Components/Power/Powernet.cs
@@ -234,12 +234,16 @@ namespace Content.Server.GameObjects.Components.Power
            {
                GeneratorList.Add(generator.Key, generator.Value);
            }
+            Supply += toMerge.Supply;
+            toMerge.Supply = 0;
            toMerge.GeneratorList.Clear();

            foreach (var device in toMerge.DeviceLoadList)
            {
                DeviceLoadList.Add(device);
            }
+            Load += toMerge.Load;
+            toMerge.Load = 0;
            toMerge.DeviceLoadList.Clear();

            DepoweredDevices.AddRange(toMerge.DepoweredDevices);