Fixed a threading error in GridGroups. Fixes #90

Author: rexxar-tc

EssentialsPlugin/AssemblyFileVersion.cs

@@ -1,10 +1,10 @@
-//83
+//96
 // 
 // 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.83")]
-[assembly: AssemblyVersion("1.13.6.83")]
+[assembly: AssemblyFileVersion("1.13.6.96")]
+[assembly: AssemblyVersion("1.13.6.96")]

EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanNoBeacon.cs

@@ -62,17 +62,17 @@ public override bool HandleCommand(ulong userId, string[] words)
 
 		    try
             {
-                string command = $"excludesblocksubtype:beacon{linkType} quiet";
+                string command = $"excludesblocksubtype:beacon quiet{linkType}";
                 HashSet<GridGroup> groups = CubeGrids.ScanGrids(0, CommandParser.GetCommandParts(command).ToArray());
-                int groupsCount = 0;
+                int groupsCount = groups.Count;
 		        int gridsCount = 0;
 
 		        foreach ( var group in groups )
 		        {
-		            if ( group.GetFatBlocks( ).Any( x =>  x is IMyBeacon ) )
-                        continue;
+		            //if ( group.GetFatBlocks( ).Any( x =>  x is IMyBeacon ) )
+                    //    continue;
 
-		            groupsCount++;
+		            //groupsCount++;
 		            gridsCount += group.Grids.Count;
 		            Communication.SendPrivateInformation( userId, $"Found group with parent {group.Parent.DisplayName} ({group.Parent.EntityId}) at {group.Parent.PositionComp.GetPosition( )} with no beacon." );
 		        }

EssentialsPlugin/Utility/CubeGrid.cs

@@ -867,7 +867,7 @@ public static HashSet<GridGroup> ScanGrids( ulong userId, string[] words )
 	        //if (!quiet)
 	            Communication.SendPrivateInformation( userId, $"Found {gridCount} grids in {groupCount} groups" );
 
-	        return groupsToConfirm;
+	        return groupsFound;
 	    }
 
 		public static bool IsFullOwner( MyCubeGrid grid, long ownerId, IMyPlayer factionPlayer = null )

EssentialsPlugin/Utility/GridGroup.cs

@@ -9,6 +9,7 @@
     using Sandbox.Game.Entities;
     using Sandbox.Game.Entities.Cube;
     using VRage.Game.Entity;
+    using VRage.ModAPI;
     using VRageMath;
 
     public class GridGroup
@@ -69,20 +70,28 @@ public MyCubeGrid Parent
 
         public GridGroup( MyCubeGrid grid, GridLinkTypeEnum linkType = GridLinkTypeEnum.Logical )
         {
-            //HACK: Manually create a group for out of scene grids because pulling them from the server crashes
             if ( grid.InScene )
             {
                 List<MyCubeGrid> tmpList = new List<MyCubeGrid>( );
 
                 //find the group containing this grid with the given link type
                 Wrapper.GameAction( ( ) => tmpList = MyCubeGridGroups.Static.GetGroups( linkType ).GetGroupNodes( grid ) );
-
-                foreach ( MyCubeGrid node in tmpList )
-                    _grids.Add( node );
+                
+                _grids.UnionWith( tmpList );
             }
+            //HACK: Manually create a group for out of scene grids because pulling them from the server crashes
             else
             {
-                _grids.Add( grid );
+                //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 );
+                
+                if ( returnSet.Count != 0 )
+                    _grids.Add( (MyCubeGrid)returnSet.First( ) );
+                else
+                    return;
             }
 
             //populate our internal lists
@@ -114,12 +123,12 @@ public static HashSet<GridGroup> GetGroups( HashSet<MyEntity> entities, GridLink
                 //on large servers this can run into the tens of seconds, so parallelize it
                 groupTasks.Add( Task.Run( ( ) =>
                                           {
-                                              if ( result.Any( x => x.Grids.Contains( grid ) ) )
-                                                  return;
+                                              var newGroup = new GridGroup( grid, linkType );
 
                                               lock ( result )
                                               {
-                                                  result.Add( new GridGroup( grid, linkType ) );
+                                                  if ( !result.Any( x => x.Grids.Contains( grid ) ) )
+                                                      result.Add( newGroup );
                                               }
                                           } ) );
             }