From 179b2534d2bfb793ed67e2b9c001b8c1f1746843 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Date: Wed, 30 May 2018 16:22:51 +0200
Subject: [PATCH] Fix load & supply desync upon merging powernets.

---
 Content.Server/GameObjects/Components/Power/Powernet.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Content.Server/GameObjects/Components/Power/Powernet.cs b/Content.Server/GameObjects/Components/Power/Powernet.cs
index d066fa5a75..7f3bf5d312 100644
--- 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);