Change block enforcement to notify SmallOwners. Added message segmenter to account for data messages > 4KB. Fixed exceptions in concealment. Implemented per-player block enforcement.

rexxar-tc · rexxar-tc · commit 1cbb5efd3530 · 2016-06-03T23:58:52.000-04:00
diff --git a/EssentialsPlugin/AssemblyFileVersion.cs b/EssentialsPlugin/AssemblyFileVersion.cs
@@ -1,10 +1,10 @@
-﻿//197
+﻿//264
 // 
 // 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.197")]
-[assembly: AssemblyVersion("1.13.6.197")]
+[assembly: AssemblyFileVersion("1.13.6.264")]
+[assembly: AssemblyVersion("1.13.6.264")]
diff --git a/EssentialsPlugin/ChatHandlers/AdminConceal/HandleAdminConceal.cs b/EssentialsPlugin/ChatHandlers/AdminConceal/HandleAdminConceal.cs
@@ -78,27 +78,21 @@ public override bool HandleCommand(ulong userId, string[] words)
 
 				Communication.SendPrivateInformation(userId, "==== Concealed Entities ===");
 				int count = 0;
-				foreach (IMyEntity entity in entities)
+				foreach (MyEntity entity in EntityManagement.UnregisteredEntities)
 				{
-					if (!(entity is IMyCubeGrid))
-						continue;
-
-					if (entity.InScene)
+					if (!(entity is MyCubeGrid))
 						continue;
-
-					IMyCubeGrid grid = (IMyCubeGrid)entity;
+                    
+					MyCubeGrid grid = (MyCubeGrid)entity;
 					long ownerId = 0;
 					string ownerName = "";
 					if (grid.BigOwners.Count > 0)
 					{
 						ownerId = grid.BigOwners.First();
-						ownerName = PlayerMap.Instance.GetPlayerItemFromPlayerId(ownerId).Name;
+						ownerName = PlayerMap.Instance.GetPlayerNameFromPlayerId( ownerId );
 					}
-
-					if (ownerName == "")
-						ownerName = "No one";
-
-					Communication.SendPrivateInformation(userId, string.Format("Id: {0} Display: {1} OwnerId: {2} OwnerName: {3} Position: {4}", entity.EntityId, entity.DisplayName, ownerId, ownerName, General.Vector3DToString(entity.GetPosition())));
+                    
+					Communication.SendPrivateInformation(userId, string.Format("Id: {0} Display: {1} OwnerId: {2} OwnerName: {3} Position: {4}", entity.EntityId, entity.DisplayName, ownerId, ownerName, General.Vector3DToString(entity.PositionComp.GetPosition())));
 					count++;
 				}
 
diff --git a/EssentialsPlugin/ChatHandlers/ChatHandlerBase.cs b/EssentialsPlugin/ChatHandlers/ChatHandlerBase.cs
@@ -5,14 +5,16 @@
     using NLog;
     using Sandbox.Engine.Multiplayer;
     using Sandbox.Game.World;
+    using SEModAPI.API;
     using SEModAPIInternal.API.Common;
     using Utility;
     public abstract class ChatHandlerBase
 	{
 		protected static readonly Logger Log = LogManager.GetLogger( "PluginLog" );
 		public ChatHandlerBase( )
 		{
-			Log.Debug(string.Format("Added chat handler: {0}", GetCommandText()));
+		    if ( ExtenderOptions.IsDebugging )
+		        Log.Debug( $"Added chat handler: {GetCommandText()}" );
 		}
 
 		public virtual Boolean CanHandle(ulong steamId, String[] words, ref int commandCount)
diff --git a/EssentialsPlugin/EntityManagers/EntityManagement.cs b/EssentialsPlugin/EntityManagers/EntityManagement.cs
@@ -249,7 +249,10 @@ private static void ConcealEntity( MyEntity entity )
             try
 			{
                 pos = 1;
-				long ownerId = ((MyCubeGrid)entity).BigOwners.FirstOrDefault();
+			    long ownerId = 0;
+			    if ( ( (MyCubeGrid)entity ).BigOwners.Count > 0 )
+			        ownerId = ( (MyCubeGrid)entity ).BigOwners[0];
+
 				string ownerName = PlayerMap.Instance.GetPlayerNameFromPlayerId( ownerId );
                 
 			    if ( PluginSettings.Instance.DynamicShowMessages )
diff --git a/EssentialsPlugin/Essentials.cs b/EssentialsPlugin/Essentials.cs
@@ -959,14 +959,43 @@ public bool BlockEnforcementEnabled
         }
 
         [Category( "Block Enforcement System" )]
-        [Description( "Enforcement Items.  These are how block enforcements are defined.  Each item is a block that is scanned for." )]
+        [Description( "Enforcement Items. These are how block enforcements are defined. Each item is a block that is scanned for." )]
         [Browsable( true )]
         [ReadOnly( false )]
         public MTObservableCollection<SettingsBlockEnforcementItem> BlockEnforcementItems
         {
             get { return PluginSettings.Instance.BlockEnforcementItems; }
         }
         
+        [Category("Block Enforcement System")]
+        [Description("This functions like the normal block enforcement, except blocks are counted per player instead of per grid.")]
+        [Browsable(true)]
+        [ReadOnly(false)]
+        public bool PlayerBlockEnforcementEnabled
+        {
+            get { return PluginSettings.Instance.PlayerBlockEnforcementEnabled; }
+            set { PluginSettings.Instance.PlayerBlockEnforcementEnabled = value; }
+        }
+
+        [Category("Block Enforcement System")]
+        [Description("If a block in player enforcement is created with no owner, it will be changed to the nearest player or the owner of the grid if there are no players.")]
+        [Browsable(true)]
+        [ReadOnly(false)]
+        public bool PlayerBlockEnforcementChangeOwner
+        {
+            get { return PluginSettings.Instance.PlayerBlockEnforcementChangeOwner; }
+            set { PluginSettings.Instance.PlayerBlockEnforcementChangeOwner = value; }
+        }
+
+        [Category("Block Enforcement System")]
+        [Description("Enforcement Items. These are how block enforcements are defined. Each item is a block that is scanned for.")]
+        [Browsable(true)]
+        [ReadOnly(false)]
+        public MTObservableCollection<SettingsBlockEnforcementItem> PlayerBlockEnforcementItems
+        {
+            get { return PluginSettings.Instance.PlayerBlockEnforcementItems; }
+        }
+
         [Category( "Reserved Slots" )]
         [Description( "This reserves slots for whitelisted players or groups." )]
         [Browsable( true )]
@@ -1294,8 +1323,10 @@ private void DoInit( string path )
             
             Protection.Init( );
             ProcessReservedSlots.Init( );
+            PlayerBlockEnforcement.Init();
             
-            //MyAPIGateway.Multiplayer.RegisterMessageHandler(9005, Communication.ReveiveMessageParts);
+            MyAPIGateway.Multiplayer.RegisterMessageHandler(9005, Communication.ReceiveMessageParts);
+            MyAPIGateway.Multiplayer.RegisterMessageHandler( 9007, Communication.HandleAddConcealExempt );
             Log.Info( "Plugin '{0}' initialized. (Version: {1}  ID: {2})", Name, Version, Id );
         }
         
@@ -1425,6 +1456,8 @@ public void Shutdown( )
                 thread.Abort( );
 
             _processThread.Abort( );
+            MyAPIGateway.Multiplayer.UnregisterMessageHandler(9005, Communication.ReceiveMessageParts);
+            MyAPIGateway.Multiplayer.UnregisterMessageHandler( 9007, Communication.HandleAddConcealExempt );
         }
 
         public void Update( )
diff --git a/EssentialsPlugin/EssentialsPlugin.csproj b/EssentialsPlugin/EssentialsPlugin.csproj
@@ -201,14 +201,14 @@
     <Compile Include="Utility\DockingItem.cs" />
     <Compile Include="Utility\Extensions.cs" />
     <Compile Include="Utility\GridGroup.cs" />
+    <Compile Include="Utility\PlayerBlockEnforcement.cs" />
     <Compile Include="Utility\Protection.cs" />
     <Compile Include="Utility\TimedEntityCleanup.cs" />
     <Compile Include="Utility\Communication.cs" />
     <Compile Include="Utility\CubeGrid.cs" />
     <Compile Include="Utility\DockingZone.cs" />
     <Compile Include="Utility\Entity.cs" />
     <Compile Include="EntityManagers\EntityManagement.cs" />
-    <Compile Include="Utility\Faction.cs" />
     <Compile Include="Utility\MathUtility.cs" />
     <Compile Include="Utility\Player.cs" />
     <Compile Include="Utility\Utility.cs" />
diff --git a/EssentialsPlugin/ProcessHandlers/ProcessBlockEnforcement.cs b/EssentialsPlugin/ProcessHandlers/ProcessBlockEnforcement.cs
@@ -5,6 +5,7 @@
 	using System.Linq;
 	using EssentialsPlugin.Settings;
 	using EssentialsPlugin.Utility;
+	using Sandbox.Game.World;
 	using Sandbox.ModAPI;
 	using Sandbox.ModAPI.Ingame;
 	using SEModAPIInternal.API.Common;
@@ -172,7 +173,7 @@ private void ScanForBlockItems( )
                         }
                         if ( !foundAdmin )
                         {
-                            foreach ( long playerId in grid.BigOwners )
+                            foreach ( long playerId in grid.SmallOwners )
                             {
                                 ulong steamId = PlayerMap.Instance.GetSteamIdFromPlayerId( playerId );
                                 if ( steamId > 0 )
diff --git a/EssentialsPlugin/Settings/PluginSettings.cs b/EssentialsPlugin/Settings/PluginSettings.cs
@@ -106,6 +106,10 @@ public class PluginSettings
         private bool _blockEnforcementEnabled;
         private MTObservableCollection<SettingsBlockEnforcementItem> _blockEnforcementItems;
 
+        private bool _playerBlockEnforcementEnabled;
+        private MTObservableCollection<SettingsBlockEnforcementItem> _playerBlockEnforcementItems;
+        private bool _changeBlockOwnerNearest;
+
         private bool _gameModeConquestEnabled;
 
         private bool _reservedSlotsEnabled;
@@ -115,7 +119,7 @@ public class PluginSettings
         private bool _reservedSlotsAdmins;
 
 	    private bool _timedCommandsEnabled;
-	    private MTObservableCollection<TimedCommandItem> _TimedCommandsItem;
+	    private MTObservableCollection<TimedCommandItem> _timedCommandsItem;
 
 	    private bool _atmosphericCargoShipsEnabled;
 	    private float _atmosphericCargoShipSpawnTime;
@@ -830,9 +834,39 @@ public MTObservableCollection<SettingsBlockEnforcementItem> BlockEnforcementItem
                 _blockEnforcementItems = value;
                 Save();
             }
-		}
+        }
 
-		public bool GameModeConquestEnabled
+        public bool PlayerBlockEnforcementEnabled
+        {
+            get { return _playerBlockEnforcementEnabled; }
+            set
+            {
+                _playerBlockEnforcementEnabled = value;
+                Save();
+            }
+        }
+
+        public bool PlayerBlockEnforcementChangeOwner
+        {
+            get { return _changeBlockOwnerNearest; }
+            set
+            {
+                _changeBlockOwnerNearest = value;
+                Save();
+            }
+        }
+
+        public MTObservableCollection<SettingsBlockEnforcementItem> PlayerBlockEnforcementItems
+        {
+            get { return _playerBlockEnforcementItems; }
+            set
+            {
+                _playerBlockEnforcementItems = value;
+                Save();
+            }
+        }
+
+        public bool GameModeConquestEnabled
 		{
 			get { return _gameModeConquestEnabled; }
 			set 
@@ -925,10 +959,10 @@ public bool TimedCommandsEnabled
 
 	    public MTObservableCollection<TimedCommandItem> TimedCommandsItems
 	    {
-	        get { return _TimedCommandsItem; }
+	        get { return _timedCommandsItem; }
 	        set
 	        {
-	            _TimedCommandsItem = value;
+	            _timedCommandsItem = value;
 	            Save(  );
 	        }
 	    }
@@ -1033,9 +1067,12 @@ public PluginSettings()
 			_blockEnforcementItems = new MTObservableCollection<SettingsBlockEnforcementItem>();
 			_blockEnforcementItems.CollectionChanged += ItemsCollectionChanged;
 
+            _playerBlockEnforcementItems = new MTObservableCollection<SettingsBlockEnforcementItem>();
+            _playerBlockEnforcementItems.CollectionChanged += ItemsCollectionChanged;
+
             _timedCommandsEnabled = false;
-            _TimedCommandsItem = new MTObservableCollection<TimedCommandItem>(  );
-            _TimedCommandsItem.CollectionChanged += ItemsCollectionChanged;
+            _timedCommandsItem = new MTObservableCollection<TimedCommandItem>(  );
+            _timedCommandsItem.CollectionChanged += ItemsCollectionChanged;
 
             _atmosphericCargoShipsEnabled = false;
             _atmosphericCargoShipSpawnTime = 10.0f;
diff --git a/EssentialsPlugin/Utility/Communication.cs b/EssentialsPlugin/Utility/Communication.cs
diff --git a/EssentialsPlugin/Utility/Faction.cs b/EssentialsPlugin/Utility/Faction.cs
diff --git a/EssentialsPlugin/Utility/GridGroup.cs b/EssentialsPlugin/Utility/GridGroup.cs
diff --git a/EssentialsPlugin/Utility/PlayerBlockEnforcement.cs b/EssentialsPlugin/Utility/PlayerBlockEnforcement.cs

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,16 @@`
`5`	`5`	`using NLog;`
`6`	`6`	`using Sandbox.Engine.Multiplayer;`
`7`	`7`	`using Sandbox.Game.World;`
	`8`	`+ using SEModAPI.API;`
`8`	`9`	`using SEModAPIInternal.API.Common;`
`9`	`10`	`using Utility;`
`10`	`11`	`public abstract class ChatHandlerBase`
`11`	`12`	`{`
`12`	`13`	`protected static readonly Logger Log = LogManager.GetLogger( "PluginLog" );`
`13`	`14`	`public ChatHandlerBase( )`
`14`	`15`	`{`
`15`		`- Log.Debug(string.Format("Added chat handler: {0}", GetCommandText()));`
	`16`	`+ if ( ExtenderOptions.IsDebugging )`
	`17`	`+ Log.Debug( $"Added chat handler: {GetCommandText()}" );`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`public virtual Boolean CanHandle(ulong steamId, String[] words, ref int commandCount)`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Linq;`
`6`	`6`	`using EssentialsPlugin.Settings;`
`7`	`7`	`using EssentialsPlugin.Utility;`
	`8`	`+ using Sandbox.Game.World;`
`8`	`9`	`using Sandbox.ModAPI;`
`9`	`10`	`using Sandbox.ModAPI.Ingame;`
`10`	`11`	`using SEModAPIInternal.API.Common;`
`@@ -172,7 +173,7 @@ private void ScanForBlockItems( )`
`172`	`173`	`}`
`173`	`174`	`if ( !foundAdmin )`
`174`	`175`	`{`
`175`		`- foreach ( long playerId in grid.BigOwners )`
	`176`	`+ foreach ( long playerId in grid.SmallOwners )`
`176`	`177`	`{`
`177`	`178`	`ulong steamId = PlayerMap.Instance.GetSteamIdFromPlayerId( playerId );`
`178`	`179`	`if ( steamId > 0 )`