(3dc4135ce) v0.9.5.1

2019-11-21 18:22:25 +01:00
parent b39922a074
commit 5c95c53118
287 changed files with 12655 additions and 5048 deletions
@@ -290,6 +290,7 @@ namespace Barotrauma.Items.Components

        public override void OnItemLoaded()
        {
+            base.OnItemLoaded();
            turbineOutputScrollBar.BarScroll = targetTurbineOutput / 100.0f;
            fissionRateScrollBar.BarScroll = targetFissionRate / 100.0f;
            var itemContainer = item.GetComponent<ItemContainer>();
@@ -604,14 +605,15 @@ namespace Barotrauma.Items.Components
        
        protected override void RemoveComponentSpecific()
        {
-            graphLine.Remove();
-            fissionRateMeter.Remove();
-            turbineOutputMeter.Remove();
-            meterPointer.Remove();
-            sectorSprite.Remove();
-            tempMeterFrame.Remove();
-            tempMeterBar.Remove();
-            tempRangeIndicator.Remove();
+            base.RemoveComponentSpecific();
+            graphLine?.Remove();
+            fissionRateMeter?.Remove();
+            turbineOutputMeter?.Remove();
+            meterPointer?.Remove();
+            sectorSprite?.Remove();
+            tempMeterFrame?.Remove();
+            tempMeterBar?.Remove();
+            tempRangeIndicator?.Remove();
        }

        public void ClientWrite(IWriteMessage msg, object[] extraData = null)