few tweaks and api for getting ranks

Author: N1Ran

Essentials/Commands/WorldModule.cs

@@ -42,19 +42,15 @@ public void CleanIdentities(int days)
             var count = 0;
             var idents = MySession.Static.Players.GetAllIdentities().ToList();
             var cutoff = DateTime.Now - TimeSpan.FromDays(days);
-            foreach (var identity in idents)
+            var removeIds = new List<MyIdentity>();
+            foreach (var identity in idents.Where(identity => identity.LastLoginTime < cutoff))
             {
-                if (identity.LastLoginTime < cutoff)
-                {
-                    //MySession.Static.Factions.KickPlayerFromFaction(identity.IdentityId);
-                    RemoveFromFaction_Internal(identity);
-                    MySession.Static.Players.RemoveIdentity(identity.IdentityId);
-                    count++;
-                }
+                count++;
+                removeIds.Add(identity);
             }
-
+            
+            FixGridOwnership(new List<long>(removeIds.Select(x => x.IdentityId)), false);
             RemoveEmptyFactions();
-            FixBlockOwnership();
             Context.Respond($"Removed {count} old identities");
         }
 
@@ -64,30 +60,25 @@ public void PurgeIdentities(int days)
         {
             var count = 0;
             var count2 = 0;
-            var grids = MyEntities.GetEntities().OfType<MyCubeGrid>().ToList();
+            var removeIds = new List<MyIdentity>();
             var idents = MySession.Static.Players.GetAllIdentities().ToList();
             var cutoff = DateTime.Now - TimeSpan.FromDays(days);
-            foreach (var identity in idents)
+            foreach (var identity in idents.Where(identity => identity.LastLoginTime < cutoff))
             {
-                if (identity.LastLoginTime < cutoff)
-                {
-                    //MySession.Static.Factions.KickPlayerFromFaction(identity.IdentityId);
-                    RemoveFromFaction_Internal(identity);
-                    MySession.Static.Players.RemoveIdentity(identity.IdentityId);
-                    count++;
-                    foreach (var grid in grids)
-                    {
-                        if (grid.BigOwners.Contains(identity.IdentityId))
-                        {
-                            grid.Close();
-                            count2++;
-                        }
-                    }
-                }
+                count++;
+                removeIds.Add(identity);
             }
 
+            if (count == 0)
+            {
+                Context.Respond($"No old identity found past {days}");
+                return;
+            }
+
+            count2 = FixGridOwnership(new List<long>(removeIds.Select(x => x.IdentityId)));
+            RemoveFromFaction_Internal(removeIds);
+
             RemoveEmptyFactions();
-            FixBlockOwnership();
             Context.Respond($"Removed {count} old identities and {count2} grids owned by them.");
         }
 
@@ -96,23 +87,16 @@ public void PurgeIdentities(int days)
         public void PurgeIdentity (string playername) {
             var count2 = 0;
             var grids = MyEntities.GetEntities().OfType<MyCubeGrid>().ToList();
-            var idents = MySession.Static.Players.GetAllIdentities().ToList();
-            foreach (var identity in idents) {
-                if (identity.DisplayName == playername) {
-                    //MySession.Static.Factions.KickPlayerFromFaction(identity.IdentityId);
-                    RemoveFromFaction_Internal(identity);
-                    MySession.Static.Players.RemoveIdentity(identity.IdentityId);
-                    foreach (var grid in grids) {
-                        if (grid.BigOwners.Contains(identity.IdentityId)) {
-                            grid.Close();
-                            count2++;
-                        }
-                    }
-                }
+            var id = Utilities.GetIdentityByNameOrIds(playername);
+
+            if (id == null)
+            {
+                Context.Respond($"No Identity found for {playername}.  Try Again");
+                return;
             }
 
+            count2 = FixGridOwnership(new List<long> { id.IdentityId });
             RemoveEmptyFactions();
-            FixBlockOwnership();
             Context.Respond($"Removed identity and {count2} grids owned by them.");
         }
 
@@ -233,6 +217,15 @@ private static int CleanFaction_Internal(int memberCount = 1)
             return result;
         }
 
+        private static void RemoveFromFaction_Internal(List<MyIdentity> Ids)
+        {
+            foreach (var identity in Ids)
+            {
+                RemoveFromFaction_Internal(identity);
+                MySession.Static.Players.RemoveIdentity(identity.IdentityId);
+            }
+        }
+
         private static bool RemoveFromFaction_Internal(MyIdentity identity)
         {
             var fac = MySession.Static.Factions.GetPlayerFaction(identity.IdentityId);
@@ -270,6 +263,36 @@ private static void RemoveFaction(MyFaction faction)
             MyAPIGateway.Session.Factions.RemoveFaction(faction.FactionId); //Added to remove factions that got through the crack
         }
 
+        private static int FixGridOwnership(List<long> Ids, bool deleteGrids = true)
+        {
+            if (Ids.Count == 0) return 0;
+            var grids = new List<MyCubeGrid>(MyEntities.GetEntities().OfType<MyCubeGrid>());
+            int count = 0;
+            foreach (var id in Ids)
+            {
+                if (id == 0) continue;
+                foreach (var grid in grids.Where(grid => grid.BigOwners.Contains(id)))
+                {
+                    if (grid.BigOwners.Count > 1)
+                    {
+                        var newOwnerId = grid.BigOwners.FirstOrDefault(x => x != id);
+                        grid.TransferBlocksBuiltByID(id, newOwnerId);
+                        foreach (var gridCubeBlock in grid.CubeBlocks.Where(x=>x.OwnerId == id))
+                        {
+                            grid.ChangeOwner(gridCubeBlock.FatBlock,id, newOwnerId);
+                        }
+                        grid.RecalculateOwners();
+                        continue;
+                    }
+                    if (deleteGrids) grid.Close();
+                    count++;
+                }
+            }
+
+            return count;
+
+        }
+
         private static int FixBlockOwnership()
         {
             int count = 0;
@@ -326,7 +349,7 @@ public void CleanSandbox()
             //clean identities that don't own any blocks, or don't have a steam ID for whatever reason
             foreach (var identity in MySession.Static.Players.GetAllIdentities().ToList())
             {
-                if (MySession.Static.Players.IdentityIsNpc(identity.IdentityId))
+                if (MySession.Static.Players.IdentityIsNpc(identity.IdentityId)  || string.IsNullOrEmpty(identity.DisplayName))
                 {
                     validIdentities.Add(identity.IdentityId);
                     continue;

Essentials/RanksAndPermissionsModule.cs

@@ -20,7 +20,7 @@ public class RanksAndPermissionsModule {
         public static List<RankData> Ranks = new List<RankData>();
         public static PlayerAccountModule PlayerAccountModule = new PlayerAccountModule();
         public static readonly Logger Log = LogManager.GetCurrentClassLogger();
-        public Dictionary<ulong, List<RankData>> PlayersInheritedRanksStore = new Dictionary<ulong, List<RankData>>();
+        public static Dictionary<ulong, List<RankData>> PlayersInheritedRanksStore = new Dictionary<ulong, List<RankData>>();
         public bool debug = true;
 
         public class Permissions {
@@ -210,6 +210,20 @@ public void HasCommandPermission(Command command, IMyPlayer player, bool hasPerm
             }
         }
 
+        public static List<string> GetInheritRankList(ulong steamID)
+        {
+            var ranksStore = new List<RankData>(PlayersInheritedRanksStore[steamID]);
+            var permList = new List<string>();
+            foreach (var rankData in ranksStore)
+            {
+                permList.Add(rankData.RankName);
+                permList.AddRange(rankData.Inherits.Where(x=>!permList.Contains(x)));
+            }
+
+            return permList;
+
+        }
+
         public Dictionary<string, List<string>> GetInheritPermList(ulong steamID) {
             Dictionary<string, List<string>> Perms = new Dictionary<string, List<string>>();