Fix crashes when deleting grids and the list of concealed entities.

Author: Jimmacle

Concealment/Commands.cs

@@ -41,5 +41,19 @@ public void RevealAll()
             int num = Plugin.RevealAll();
             Context.Respond($"{num} grids revealed.");
         }
+
+        [Command("conceal on", "Enable concealment.")]
+        public void Enable()
+        {
+            Plugin.Settings.Data.Enabled = true;
+            Plugin.ConcealGrids(Plugin.Settings.Data.ConcealDistance);
+        }
+
+        [Command("conceal off", "Disable concealment.")]
+        public void Disable()
+        {
+            Plugin.Settings.Data.Enabled = false;
+            Plugin.RevealAll();
+        }
     }
 }

Concealment/ConcealGroup.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using NLog;
 using Sandbox.Game.Entities;
 using Sandbox.Game.Entities.Blocks;
 using Sandbox.Game.World;
@@ -48,21 +49,26 @@ public void UpdatePostConceal()
         public void UpdatePostReveal()
         {
             IsConcealed = false;
-            foreach (var grid in Grids)
-                grid.OnClosing -= Grid_OnClosing;
+            UnhookOnClosing();
         }
 
         private void HookOnClosing()
         {
             foreach (var grid in Grids)
-                grid.OnClosing += Grid_OnClosing;
+                grid.OnMarkForClose += Grid_OnMarkForClose;
         }
 
-        private void Grid_OnClosing(VRage.Game.Entity.MyEntity obj)
+        private void UnhookOnClosing()
         {
-            Closing?.Invoke(this);
             foreach (var grid in Grids)
-                grid.OnClosing -= Grid_OnClosing;
+                grid.OnMarkForClose -= Grid_OnMarkForClose;
+        }
+
+        private void Grid_OnMarkForClose(VRage.Game.Entity.MyEntity obj)
+        {
+            LogManager.GetLogger(nameof(ConcealGroup)).Info($"Grid group '{GridNames}' was marked for close.");
+            UnhookOnClosing();
+            Closing?.Invoke(this);
         }
 
         public void UpdateAABB()

Concealment/ConcealmentControl.xaml

@@ -6,11 +6,19 @@
              xmlns:local="clr-namespace:Concealment"
              mc:Ignorable="d"
              d:DesignHeight="300" d:DesignWidth="300">
-    <DockPanel>
-        <StackPanel DockPanel.Dock="Top">
+    <UserControl.DataContext>
+        <local:ConcealmentPlugin/>
+    </UserControl.DataContext>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0">
             <StackPanel DataContext="{Binding Settings.Data}">
                 <CheckBox Content="Enable Concealment" Margin="3" IsChecked="{Binding Enabled}" />
-                <CheckBox Content="Exempt Production" ToolTip="Don't conceal grids with active production blocks." Margin="3" IsChecked="{Binding ExemptProduction}" />
+                <CheckBox Content="Conceal Production" ToolTip="Conceal grids with active production blocks." Margin="3" IsChecked="{Binding ConcealProduction}" />
+                <CheckBox Content="Conceal Pirates" ToolTip="Conceal grids owned by Space Pirates." Margin="3" IsChecked="{Binding ConcealPirates}" />
                 <StackPanel Orientation="Horizontal">
                     <TextBox Margin="3" Width="150" Text="{Binding ConcealDistance}" />
                     <Label Content="Conceal Distance (meters)" Margin="3" />
@@ -33,9 +41,10 @@
                 <Button Content="Manual Reveal" Margin="3" Click="Reveal_OnClick" />
             </StackPanel>
             <Button Content="Edit Excluded Subtypes" Margin="3" Click="EditExclusion_OnClick"/>
+            <Label Content="{Binding ConcealedGroups.Count, StringFormat=Concealed groups: {0}}"/>
+            <Button Content="Reveal Selected" Margin="3" DockPanel.Dock="Bottom" Click="RevealSelected_OnClick" />
         </StackPanel>
-        <Button Content="Reveal Selected" Margin="3" DockPanel.Dock="Bottom" Click="RevealSelected_OnClick" />
-        <ListView Name="Concealed" Margin="3" DockPanel.Dock="Bottom" ItemsSource="{Binding ConcealGroups}">
+        <ListView Grid.Row="1" Name="Concealed" Margin="3" DockPanel.Dock="Bottom" ItemsSource="{Binding ConcealedGroups}">
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
                     <StackPanel>
@@ -44,6 +53,6 @@
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ListView>
-    </DockPanel>
+    </Grid>
 
 </UserControl>

Concealment/ConcealmentControl.xaml.cs

@@ -39,7 +39,7 @@ private void RevealSelected_OnClick(object sender, RoutedEventArgs e)
         private void Reveal_OnClick(object sender, RoutedEventArgs e)
         {
             var p = Plugin;
-            Plugin.Torch.Invoke(delegate { p.RevealNearbyGrids(p.Settings.Data.RevealDistance); });
+            Plugin.Torch.Invoke(delegate { p.RevealGrids(p.Settings.Data.RevealDistance); });
         }
 
         private void Conceal_OnClick(object sender, RoutedEventArgs e)