Added ability to delete ships which are fully-owned by NPCs from the sector when saving.

Also allows those NPCs to be deleted, at the same time.
Fixed some missing removals.

Author: dodexahedron

GetOutOfMySandbox/AssemblyFileVersion.cs

@@ -1,10 +1,10 @@
-//40
+//45
 // 
 // 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.0.0.40")]
-[assembly: AssemblyVersion("1.0.0.40")]
+[assembly: AssemblyFileVersion("1.0.0.45")]
+[assembly: AssemblyVersion("1.0.0.45")]

GetOutOfMySandbox/GetOutOfMySandbox.cs

@@ -70,13 +70,25 @@ void Instance_WorldSaved( )
 			{
 				string sandboxPath = Path.Combine( Server.Instance.Config.LoadWorld, "Sandbox.sbc" );
 				XDocument sandboxSbc = XDocument.Load( sandboxPath );
-				XDocument sectorFile = XDocument.Load( Path.Combine( Server.Instance.Config.LoadWorld, "SANDBOX_0_0_0_.sbs" ) );
+				string sectorPath = Path.Combine( Server.Instance.Config.LoadWorld, "SANDBOX_0_0_0_.sbs" );
+				XDocument sectorFile = XDocument.Load( sectorPath );
+				if ( PluginSettings.Instance.DeleteNpcShips )
+				{
+					IEnumerable<string> npcIds = sandboxSbc.XPathSelectElements( "/MyObjectBuilder_Checkpoint/Identities/MyObjectBuilder_Identity[DisplayName='Neutral NPC']" ).Select( n => n.Element( XName.Get( "IdentityId" ) ).Value );
+					Log.Info( "Deleting NPC ships for NPC IDs: {0}", string.Join( ", ", npcIds ) );
+					foreach ( string id in npcIds )
+					{
+						sectorFile.XPathSelectElements( string.Format( "/MyObjectBuilder_Sector/SectorObjects/MyObjectBuilder_EntityBase[CubeBlocks/MyObjectBuilder_CubeBlock/Owner='{0}']", id ) ).Remove( );
+					}
+				}
+
+
 				IEnumerable<XElement> allIdentities = sandboxSbc.XPathSelectElements( "/MyObjectBuilder_Checkpoint/Identities/MyObjectBuilder_Identity/IdentityId" );
 				IEnumerable<XElement> cubeBlockOwners = sectorFile.XPathSelectElements( "/MyObjectBuilder_Sector/SectorObjects/MyObjectBuilder_EntityBase/CubeBlocks/MyObjectBuilder_CubeBlock/Owner" );
 				IEnumerable<XElement> factionMembers = sandboxSbc.XPathSelectElements( "/MyObjectBuilder_Checkpoint/Factions/Factions/MyObjectBuilder_Faction/Members/MyObjectBuilder_FactionMember/PlayerId" );
-
 				List<string> idsToRemove = new List<string>( allIdentities.Select( o => o.Value ).Distinct( ).ToArray( ) );
 
+
 				string[ ] cubeBlockOwnerIds = cubeBlockOwners.Select( o => o.Value ).Distinct( ).ToArray( );
 				idsToRemove.RemoveAll( o => cubeBlockOwnerIds.Contains( o ) );
 
@@ -90,25 +102,27 @@ void Instance_WorldSaved( )
 				{
 					Log.Info( "Removing identity {0}", i );
 					//Remove toolbar settings, etc
-					XElement settingsElement = sandboxSbc.XPathSelectElement( string.Format( "/MyObjectBuilder_Checkpoint/AllPlayersData/dictionary/item[Value/IdentityId='{0}']", i ) );
-					if ( settingsElement != null )
-					{
-						settingsElement.Remove( );
-					}
+					sandboxSbc.XPathSelectElements( string.Format( "/MyObjectBuilder_Checkpoint/AllPlayersData/dictionary/item[Value/IdentityId='{0}']", i ) ).Remove( );
 
 					//Remove from factions
 					sandboxSbc.XPathSelectElements( string.Format( "/MyObjectBuilder_Checkpoint/Factions/Factions/MyObjectBuilder_Faction/Members/MyObjectBuilder_FactionMember[PlayerId='{0}']", i ) ).Remove( );
+					sandboxSbc.XPathSelectElements( string.Format( "/MyObjectBuilder_Checkpoint/Factions/Players/dictionary/item[Key='{0}']", i ) ).Remove( );
+
 					//Remove chat history
-					//XElement chatHistoryElement = sandboxSbc.XPathSelectElement( string.Format( "/MyObjectBuilder_Checkpoint/ChatHistory/MyObjectBuilder_ChatHistory/PlayerChatHistory/MyObjectBuilder_PlayerChatHistory[ID='{0}']", i ) );
-					//chatHistoryElement.Remove( );
-					//sandboxSbc.XPathSelectElement( string.Format( "/MyObjectBuilder_Checkpoint/ChatHistory/MyObjectBuilder_ChatHistory/[IdentityId='{0}']", i ) ).Remove( );
+					//Stuff other people have received
+					sandboxSbc.XPathSelectElements( string.Format( "/MyObjectBuilder_Checkpoint/ChatHistory/MyObjectBuilder_ChatHistory/PlayerChatHistory/MyObjectBuilder_PlayerChatHistory[ID='{0}']", i ) ).Remove( );
+					//Stuff this person has sent
+					sandboxSbc.XPathSelectElements( string.Format( "/MyObjectBuilder_Checkpoint/ChatHistory/MyObjectBuilder_ChatHistory[IdentityId='{0}']", i ) ).Remove( );
+
 					//Remove GPS entries
-					sandboxSbc.XPathSelectElements( string.Format( "/MyObjectBuilder_Checkpoint/Gps/dictionary/item[Key='{0}']", i ) ).Remove(  );
+					sandboxSbc.XPathSelectElements( string.Format( "/MyObjectBuilder_Checkpoint/Gps/dictionary/item[Key='{0}']", i ) ).Remove( );
+
 					//Remove the identity
-					sandboxSbc.XPathSelectElement( string.Format( "/MyObjectBuilder_Checkpoint/Identities/MyObjectBuilder_Identity[IdentityId='{0}']", i ) ).Remove( );
+					sandboxSbc.XPathSelectElements( string.Format( "/MyObjectBuilder_Checkpoint/Identities/MyObjectBuilder_Identity[IdentityId='{0}']", i ) ).Remove( );
 				}
 
 				sandboxSbc.Save( sandboxPath );
+				sectorFile.Save( sectorPath );
 			}
 			catch ( FileNotFoundException ex )
 			{
@@ -176,5 +190,23 @@ public bool IgnoreFactionMembership
 			}
 		}
 
+		[Category( "Behavior" )]
+		[Description( "Delete CubeGrids that are owned only by NPCs." )]
+		[Browsable( true )]
+		[ReadOnly( false )]
+		[DisplayName( "Delete NPC Ships" )]
+		public bool DeleteNpcShips
+		{
+			get
+			{
+				return PluginSettings.Instance.DeleteNpcShips;
+			}
+
+			set
+			{
+				PluginSettings.Instance.DeleteNpcShips = value;
+			}
+		}
+
 	}
 }

GetOutOfMySandbox/PluginSettings.cs

@@ -13,6 +13,7 @@ public class PluginSettings
 		private static PluginSettings _instance;
 		private bool _loading;
 		private bool _ignoreFactionMembership;
+		private bool _deleteNpcShips;
 
 		/// <summary>Singleton instance of the <see cref="PluginSettings"/> class.</summary>
 		internal static PluginSettings Instance { get { return _instance ?? ( _instance = new PluginSettings( ) ); } }
@@ -118,6 +119,17 @@ public bool IgnoreFactionMembership
 			}
 		}
 
+		[XmlElement( Namespace = "SESE:Plugin:GetOutOfMySandbox", Type = typeof( bool ) )]
+		public bool DeleteNpcShips
+		{
+			get { return _deleteNpcShips; }
+			set
+			{
+				_deleteNpcShips = value;
+				OnSettingsChanged( );
+			}
+		}
+
 		public event SettingsChangedEventHandler SettingsChanged;
 
 		protected virtual void OnSettingsChanged( )