Fix crashes and permission issues

Author: Jimmacle

Essentials/Commands/DeleteModule.cs

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Sandbox.Game.Entities;
 using Torch.Commands;
+using Torch.Commands.Permissions;
 using VRage.Game.ModAPI;
 
 namespace Essentials
@@ -13,6 +14,7 @@ namespace Essentials
     public class DeleteModule : CommandModule
     {
         [Command("grids nosubtype", "Delete all grids that don't have a block of the given subtype.")]
+        [Permission(MyPromoteLevel.SpaceMaster)]
         public void DeleteBySubtype(string subtype)
         {
             var count = 0;
@@ -41,6 +43,7 @@ bool ShouldRemove(MyCubeGrid grid)
         }
 
         [Command("grids ownedby", "Delete grids that the given player owns the majority of.")]
+        [Permission(MyPromoteLevel.SpaceMaster)]
         public void DeleteByOwner(string name)
         {
             var player = Utilities.GetPlayerByNameOrId(name);
@@ -64,6 +67,7 @@ public void DeleteByOwner(string name)
         }
 
         [Command("grids blockslessthan", "Delete grids with fewer than X blocks.")]
+        [Permission(MyPromoteLevel.SpaceMaster)]
         public void DeleteBlocksLessThan(int minBlocks)
         {
             var count = 0;
@@ -79,6 +83,8 @@ public void DeleteBlocksLessThan(int minBlocks)
             Context.Respond($"Deleted {count} grids with less than {minBlocks} blocks.");
         }
 
+        [Command("grids blocksgreaterthan", "Delete grids with greater than X blocks.")]
+        [Permission(MyPromoteLevel.SpaceMaster)]
         public void DeleteBlocksGreaterThan(int maxBlocks)
         {
             var count = 0;
@@ -95,6 +101,7 @@ public void DeleteBlocksGreaterThan(int maxBlocks)
         }
 
         [Command("floating", "Delete all floating objects.")]
+        [Permission(MyPromoteLevel.SpaceMaster)]
         public void DeleteFloating()
         {
             var count = 0;

Essentials/Commands/EntityModule.cs

@@ -59,16 +59,15 @@ public void Delete(string entityName)
         [Permission(MyPromoteLevel.SpaceMaster)]
         public void Find(string name)
         {
-            var search = name;
-            if (string.IsNullOrEmpty(search))
+            if (string.IsNullOrEmpty(name))
                 return;
 
             var sb = new StringBuilder("Found entities:\n");
             foreach (var entity in MyEntities.GetEntities())
             {
-                if (entity is IMyVoxelBase voxel && voxel.StorageName.Contains(search, StringComparison.CurrentCultureIgnoreCase))
+                if (entity is IMyVoxelBase voxel && (voxel.StorageName?.Contains(name, StringComparison.CurrentCultureIgnoreCase) ?? false))
                     sb.AppendLine($"{voxel.StorageName} ({entity.EntityId})");
-                else if (entity.DisplayName?.Contains(search, StringComparison.CurrentCultureIgnoreCase) ?? false)
+                else if (entity?.DisplayName?.Contains(name, StringComparison.CurrentCultureIgnoreCase) ?? false)
                     //This can be null??? :keen:
                     sb.AppendLine($"{entity.DisplayName} ({entity.EntityId})");
             }
@@ -102,7 +101,7 @@ public void Teleport(string destination, string entityToMove = null)
 
             IMyEntity targetEntity;
             if (string.IsNullOrEmpty(entityToMove))
-                targetEntity = Context.Player.Controller.ControlledEntity.Entity;
+                targetEntity = Context.Player?.Controller.ControlledEntity.Entity;
             else
                 Utilities.TryGetEntityByNameOrId(entityToMove, out targetEntity);
 

Essentials/Commands/GridModule.cs

@@ -44,6 +44,10 @@ public void SetOwner(string gridName, string playerName)
                 identityId = player.IdentityId;
             }
 
+            grid.ChangeGridOwnership(identityId, MyOwnershipShareModeEnum.Faction);
+            Context.Respond($"Transferred ownership of {grid.DisplayName} to {identityId}");
+
+            /*
             grid.GetBlocks(new List<IMySlimBlock>(), block =>
             {
                 var cubeBlock = block.FatBlock as MyCubeBlock;
@@ -54,23 +58,25 @@ public void SetOwner(string gridName, string playerName)
                 cubeBlock?.ChangeOwner(0, MyOwnershipShareModeEnum.All);
                 cubeBlock?.ChangeOwner(identityId, ownerComp.ShareMode);
                 return false;
-            });
+            });*/
         }
 
         [Command("static large", "Makes all large grids static.")]
+        [Permission(MyPromoteLevel.SpaceMaster)]
         public void StaticLarge()
         {
             foreach (var grid in MyEntities.GetEntities().OfType<MyCubeGrid>().Where(g => g.GridSizeEnum == MyCubeSize.Large))
                 grid.ConvertToStatic();
         }
 
         [Command("list", "List all grids owned by you.")]
+        [Permission(MyPromoteLevel.None)]
         public void List()
         {
             var sb = new StringBuilder("Grids:\n");
             foreach (var grid in MyEntities.GetEntities().OfType<MyCubeGrid>())
             {
-                if (grid.BigOwners.Contains(Context.Player.IdentityId))
+                if (grid.BigOwners.Contains(Context.Player?.IdentityId ?? 0))
                     sb.AppendLine($"{grid.DisplayName}: {grid.PositionComp.GetPosition().ToString("N")}");
             }
             Context.Respond(sb.ToString());

Essentials/Commands/PlayerModule.cs

@@ -13,6 +13,7 @@ namespace Essentials
     public class PlayerModule : CommandModule
     {
         [Command("w", "Send a private message to another player.")]
+        [Permission(MyPromoteLevel.None)]
         public void Whisper(string playerName)
         {
             if (Context.Args.Count < 1)
@@ -32,7 +33,7 @@ public void Whisper(string playerName)
                 return;
             }
 
-            Context.Torch.Multiplayer.SendMessage(message, Context.Player.DisplayName, player.IdentityId, MyFontEnum.Red);
+            Context.Torch.Multiplayer.SendMessage(message, Context.Player?.DisplayName ?? "Server", player.IdentityId, MyFontEnum.Red);
         }
 
         [Command("kick", "Kick a player from the game.")]

Essentials/Commands/WorldModule.cs

@@ -6,12 +6,15 @@
 using Sandbox.Game.Entities;
 using Sandbox.Game.World;
 using Torch.Commands;
+using Torch.Commands.Permissions;
+using VRage.Game.ModAPI;
 
 namespace Essentials.Commands
 {
     public class WorldModule : CommandModule
     {
         [Command("identity clean", "Remove identities that have not logged on in X days.")]
+        [Permission(MyPromoteLevel.SpaceMaster)]
         public void CleanIdentities(int days)
         {
             var idents = MySession.Static.Players.GetAllIdentities().ToList();
@@ -24,6 +27,7 @@ public void CleanIdentities(int days)
         }
 
         [Command("identity purge", "Remove identities AND the grids they own if they have not logged on in X days.")]
+        [Permission(MyPromoteLevel.SpaceMaster)]
         public void PurgeIdentities(int days)
         {
             var grids = MyEntities.GetEntities().OfType<MyCubeGrid>().ToList();

Essentials/EssentialsPlugin.cs

@@ -10,7 +10,7 @@
 
 namespace Essentials
 {
-    [Plugin("Essentials", "1.0", "cbfdd6ab-4cda-4544-a201-f73efa3d46c0")]
+    [Plugin("Essentials", "1.1", "cbfdd6ab-4cda-4544-a201-f73efa3d46c0")]
     public class EssentialsPlugin : TorchPluginBase, IWpfPlugin
     {
         private EssentialsControl _control;