Fixes #89, blocksubtype scan commands didn't work correctly. Should fix #91. Fixes concealed grids not showing in grid scans. Fixes concealment still causing ships to move when revealed. Changed server restart behavior to fix issues with mods not getting the shutdown signal.

Author: rexxar-tc

EssentialsPlugin/AssemblyFileVersion.cs

@@ -1,10 +1,10 @@
-//96
+//117
 // 
 // This code was generated by a tool. Any changes made manually will be lost
 // the next time this code is regenerated.
 // 
 
 using System.Reflection;
 
-[assembly: AssemblyFileVersion("1.13.6.96")]
-[assembly: AssemblyVersion("1.13.6.96")]
+[assembly: AssemblyFileVersion("1.13.6.117")]
+[assembly: AssemblyVersion("1.13.6.117")]

EssentialsPlugin/EntityManagers/EntityManagement.cs

@@ -567,11 +567,11 @@ private static void ConcealEntity( IMyEntity entity )
 
                         pos = 6;
                         RemovedGrids.Add( entity.EntityId );
-                        entity.InScene = false;
-                        entity.OnRemovedFromScene( entity );
-						BaseEntityNetworkManager.BroadcastRemoveEntity( entity, false );
+                        newEntity.InScene = false;
+						//BaseEntityNetworkManager.BroadcastRemoveEntity( entity, false );
+                        entity.Close( );
 						MyAPIGateway.Entities.AddEntity( newEntity, false );
-                        MyMultiplayer.ReplicateImmediatelly( MyExternalReplicable.FindByObject( newEntity ) );
+                        //MyMultiplayer.ReplicateImmediatelly( MyExternalReplicable.FindByObject( newEntity ) );
 
                         pos = 7;
                         if ( PluginSettings.Instance.DynamicShowMessages )
@@ -1044,15 +1044,19 @@ public static void RevealEntity( KeyValuePair<IMyEntity, string> item )
 						return;
 					}
 
+				    newEntity.Physics.Enabled = false;
+
 					RemovedGrids.Add( entity.EntityId );
-                    entity.InScene = true;
-                    entity.OnAddedToScene( entity );
 				    entity.Physics.Enabled = false;
 				    entity.Close( );
+
+                    Thread.Sleep( 50 );
+				    newEntity.Physics.Enabled = true;
+                    newEntity.InScene = true;
                     MyAPIGateway.Entities.AddEntity( newEntity );
                     //MyMultiplayer.ReplicateImmediatelly( MyExternalReplicable.FindByObject( newEntity ) );
-                    entity.Physics.LinearVelocity = Vector3.Zero;
-                    entity.Physics.AngularVelocity = Vector3.Zero;
+                    newEntity.Physics.LinearVelocity = Vector3.Zero;
+                    newEntity.Physics.AngularVelocity = Vector3.Zero;
 
                     if ( PluginSettings.Instance.DynamicShowMessages )
 						Essentials.Log.Info( "Revealed - Id: {0} -> {4} Display: {1} OwnerId: {2} OwnerName: {3}  Reason: {5}",

EssentialsPlugin/ProcessHandlers/ProcessRestart.cs

@@ -94,6 +94,9 @@ public override void Handle()
 
 		private void DoRestart()
 		{
+            // Tell SE to shut down
+            Wrapper.GameAction( ()=>MySandboxGame.Static.Exit(  ) );
+            Thread.Sleep( 15000 );
 			// If we're not a service, restart with a .bat otherwise just exit and let the service be restarted
 			if (Environment.UserInteractive)
 			{

EssentialsPlugin/Utility/CubeGrid.cs

@@ -772,22 +772,24 @@ public static HashSet<GridGroup> ScanGrids( ulong userId, string[] words )
 	        if ( !quiet )
 	            Communication.SendPrivateInformation( userId,
 	                                                  $"Scanning for ships with options: {GetOptionsText( options )}" );
-
-	        HashSet<GridGroup> groupsToConfirm = new HashSet<GridGroup>( );
+            
 	        HashSet<GridGroup> groups = GridGroup.GetAllGroups( connectionType );
 	        HashSet<GridGroup> groupsFound = new HashSet<GridGroup>( );
             List<Task> scanTasks = new List<Task>();
 
             /*
-            * invert scan logic here
-            * if we find a group that fails any of the checks, break
-            * everything else implicitly goes into the found list
+            * Invert scan logic here.
+            * If we find a group that fails any of the checks, break.
+            * Everything else implicitly goes into the found list.
             * 
-            * on large servers this can run into the tens of seconds,
-            * so parallelize it
+            * On large servers this can run into the tens of seconds,
+            * so parallelize it.
             */
 	        foreach ( GridGroup group in groups )
 	        {
+	            if ( group?.Parent == null )
+	                continue;
+
 	            scanTasks.Add( Task.Run( ( ) =>
 	                                     {
 	                                         if ( power == StateEnum.RequiresYes && !DoesGroupHavePowerSupply( group ) )
@@ -836,14 +838,14 @@ public static HashSet<GridGroup> ScanGrids( ulong userId, string[] words )
 	                                         if ( hasBlockSubType && !blockSubTypes.Any( x => DoesGroupHaveBlockSubtype( group, x.Key, x.Value ) ) )
 	                                             return;
 
-	                                         if ( excludesBlockType && blockSubTypes.Any( x => DoesGroupHaveBlockType( group, x.Key, x.Value + 1 ) ) )
+	                                         if ( excludesBlockType && blockSubTypes.Any( x => DoesGroupHaveBlockType( group, x.Key, x.Value ) ) )
 	                                             return;
 
 	                                         if ( includesBlockType && !blockTypes.Any( x => DoesGroupHaveBlockType( group, x.Key, x.Value ) ) )
 	                                             return;
 
 	                                         if ( hasBlockSubTypeLimits &&
-	                                              !blockSubTypes.Any( x => DoesGroupHaveBlockSubtype( group, x.Key, x.Value + 1 ) ) )
+	                                              !blockSubTypes.Any( x => DoesGroupHaveBlockSubtype( group, x.Key, x.Value ) ) )
 	                                             return;
 
 	                                         lock ( groupsFound )
@@ -859,7 +861,7 @@ public static HashSet<GridGroup> ScanGrids( ulong userId, string[] words )
 	        foreach (GridGroup group in groupsFound)
 	        {
 	            if (!quiet)
-	                Communication.SendPrivateInformation( userId, $"Found group with parent {group.Parent.DisplayName}, owner {group.Parent.GetOwner(  )}" );
+	                Communication.SendPrivateInformation( userId, $"Found group with parent {group.Parent.DisplayName}, owner: {group.Parent.GetOwner(  ) ?? "none"}" );
 
 	            gridCount += group.Grids.Count;
 	        }

EssentialsPlugin/Utility/Extensions.cs

@@ -34,7 +34,7 @@ public static string GetOwner( this IMyCubeGrid grid )
                 if (ownerIdentity != null)
                     return ownerIdentity.DisplayName;
             }
-            return "";
+            return null;
         }
 
         public static string GetOwner( this MyCubeGrid grid )

EssentialsPlugin/Utility/GridGroup.cs

@@ -85,10 +85,10 @@ public GridGroup( MyCubeGrid grid, GridLinkTypeEnum linkType = GridLinkTypeEnum.
                 //use the old method to filter out grids with pisons or rotors, for safety
                 HashSet<IMyEntity> thisEntity = new HashSet<IMyEntity>();
                 HashSet<IMyEntity> returnSet = new HashSet<IMyEntity>();
-                thisEntity.Add( grid );
-                CubeGrids.GetGridsUnconnected( thisEntity, returnSet );
+                thisEntity.Add( (IMyEntity)grid );
+                CubeGrids.GetGridsUnconnected( returnSet, thisEntity );
 
-                if ( returnSet.Count != 0 )
+                if ( returnSet.Count > 0 )
                     _grids.Add( (MyCubeGrid)returnSet.First( ) );
                 else
                     return;