Updates

Author: Bishbash777

Essentials/Commands/VoxelModule.cs

@@ -259,6 +259,32 @@ public void ResetVoxelArea(float Radius)
             }
 
 
+        }
+        
+        [Command("reset planet area", "Resets voxel damange in specified radius from player")]
+        [Permission(MyPromoteLevel.Admin)]
+        public void ResetPlanetVoxelArea(float Radius)
+        {
+            if (Context.Player == null)
+                Context.Respond("Invalid command input! Must be ingame!");
+ 
+
+            if(Radius <= 0)
+            {
+                Context.Respond("Inavlid radius!");
+                return;
+            }
+                
+
+            if(ResetPlanetVoxelsInArea(Context.Player.GetPosition(), Radius)) {
+                Context.Respond("Voxel reset complete!");
+            }
+            else
+            {
+                Context.Respond("Couldnt reset voxels! Check log for more information!");
+            }
+            
+
         }
 
         [Command("reset gps", "Resets voxel damange in specified radius from given point")]
@@ -342,6 +368,67 @@ private static bool ResetVoxelInArea(Vector3D Center, float Radius)
                 return false;
             }
         }
+        
+        private static bool ResetPlanetVoxelsInArea(Vector3D center, float radius)
+        {
+            try
+            {
+                BoundingSphereD sphere = new BoundingSphereD(center, radius);
+                List<MyPlanet> planets = MyEntities.GetEntitiesInSphere(ref sphere).OfType<MyPlanet>().ToList();
+                if (planets.Count == 0)
+                    return true;
+
+                foreach (var planet in planets)
+                {
+                    using (planet.Pin())
+                    {
+                        if (planet.MarkedForClose)
+                        {
+                            continue;
+                        }
+
+                        MyShapeSphere shape = new MyShapeSphere
+                        {
+                            Center = center,
+                            Radius = radius
+                        };
+
+                        // Planet-specific adjustment to voxel coordinates
+                        Vector3I minCorner, maxCorner;
+                        BoundingBoxD shapeAabb = shape.GetWorldBoundaries();
+                        Vector3I storageSize = planet.Storage.Size;
+                        MyVoxelCoordSystems.WorldPositionToVoxelCoord(planet.PositionLeftBottomCorner, ref shapeAabb.Min, out minCorner);
+                        MyVoxelCoordSystems.WorldPositionToVoxelCoord(planet.PositionLeftBottomCorner, ref shapeAabb.Max, out maxCorner);
+                        minCorner += planet.StorageMin;
+                        maxCorner += planet.StorageMin;
+                        maxCorner += 1;
+                        storageSize -= 1;
+
+                        Vector3I.Clamp(ref minCorner, ref Vector3I.Zero, ref storageSize, out minCorner);
+                        Vector3I.Clamp(ref maxCorner, ref Vector3I.Zero, ref storageSize, out maxCorner);
+
+                        planet.Storage.DeleteRange(MyStorageDataTypeFlags.ContentAndMaterial, minCorner, maxCorner, false);
+
+                        BoundingBoxD cutOutBox = shape.GetWorldBoundaries();
+                        MySandboxGame.Static.Invoke(delegate
+                        {
+                            if (planet.Storage != null)
+                            {
+                                planet.Storage.NotifyChanged(minCorner, maxCorner, MyStorageDataTypeFlags.ContentAndMaterial);
+                                MyVoxelGenerator.NotifyVoxelChanged(MyVoxelBase.OperationType.Revert, planet, ref cutOutBox);
+                            }
+                        }, "ResetPlanetVoxels notify");
+                    }
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _log.Error(ex, "Planet voxel reset failed!");
+                return false;
+            }
+        }
+
 
         private static LockToken PinDelete()
         {

��Essentials/Conditions/ConditionsImplementations.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Sandbox.ModAPI;
 using Vector3D = VRageMath.Vector3D;
 
 namespace Essentials.Commands
@@ -61,6 +62,21 @@ public static bool HasGridType(MyCubeGrid grid, string gridType)
             // In all other cases, just return false.
             return false;
         }
+        
+        public static bool IsNPCTradeStation(MyCubeGrid grid)
+        {
+            if (grid == null)
+                return false;
+
+            if (grid.IsStatic && grid.GridSizeEnum == VRage.Game.MyCubeSize.Large)
+            {
+                var faction = MyAPIGateway.Session.Factions.TryGetPlayerFaction(grid.BigOwners.FirstOrDefault());
+                if (faction != null && faction.Tag == "NPC")
+                    return true;
+            }
+
+            return false;
+        }
 
         [Condition("hasownertype", helpText: "Finds grids with the specified owner type (npc | player | nobody).")]
         public static bool HasOwnerType(MyCubeGrid grid, string ownerType)

Essentials/EssentialsPlugin.cs

@@ -215,8 +215,7 @@ private void EntityAdded(MyEntity myEntity)
 
 
         public static void InsertDiscordID(ulong steamID, string discordID, string discordName, Dictionary<ulong,string> RoleData) {
-            PlayerAccountModule.InsertDiscord(steamID, discordID, discordName, RoleData);
-            
+            //removed for now
         }
 
         private void ProcessBags()

Essentials/Patches/ChatMessagePatch.cs

@@ -51,10 +51,6 @@ private static bool OnChatMessageReceived_Server(ref ChatMsg msg) {
                 var Account = PlayerAccountData.GetAccount(msg.Author);
                 if (Account != null) {
                     var Rank = RanksAndPermissions.GetRankData(Account.Rank);
-                    if (Rank.DisplayPrefix) {
-                        msg.Author = 0;
-                        msg.CustomAuthorName = $"{Rank.Prefix}{Account.Player}";
-                    }
                 }
                 return true;
             }

Essentials/PlayerAccountModule.cs

@@ -118,25 +118,6 @@ public void SaveAccountData() {
             File.WriteAllText(EssentialsPlugin.Instance.homeDataPath, JsonConvert.SerializeObject(PlayersAccounts, Formatting.Indented));
         }
 
-        public static void InsertDiscord(ulong steamID, string discordID, string discordName, Dictionary<ulong, string> RoleData) {
-            Log.Info($"DiscordID for {steamID} received from SEDB!... Inserting into player account ({discordID})");
-            var AccModule = new PlayerAccountModule();
-            var account = AccModule.GetAccount(steamID);
-
-            account.DiscordData.DiscordID = ulong.Parse(discordID);
-            account.DiscordData.DiscordName = discordName;
-            foreach (var role in RoleData) {
-                if (account.DiscordData.DiscordID == ulong.Parse(discordID)) {
-                    account.DiscordData.DiscordName = discordName;
-                    if (!account.DiscordData.Roles.ContainsKey(role.Key)) {
-                        account.DiscordData.Roles.Add(role.Key, role.Value);
-                    }
-                }
-            } 
-
-            AccModule.UpdatePlayerAccount(account);
-        }
-
         public void GenerateAccount(Torch.API.IPlayer player) {
             try {
                 var state = new MyP2PSessionState();
@@ -183,12 +164,6 @@ public void CheckIp(Torch.API.IPlayer Player) {
             Sandbox.Engine.Networking.MyGameService.Peer2Peer.GetSessionState(Player.SteamId, ref state);
             var ip = new IPAddress(BitConverter.GetBytes(state.RemoteIP).Reverse().ToArray());
 
-            foreach (var account in PlayersAccounts) {
-                if (account.KnownIps.Contains(ip.ToString()) && account.Player != Player.Name) {
-                    Log.Warn($"WARNING! {Player.Name} shares the same IP address as {account.Player}");
-                }
-            }
-
         }
 
         public string GetRank(ulong steamID) {