Update for SE v 1.123

rexxar-tc · rexxar-tc · commit 57343d5b2c79 · 2016-02-25T13:46:36.000-05:00
diff --git a/.vs/EssentialsPlugin/EssentialsPlugin.scgdat b/.vs/EssentialsPlugin/EssentialsPlugin.scgdat
diff --git a/EssentialsPlugin/AssemblyFileVersion.cs b/EssentialsPlugin/AssemblyFileVersion.cs
@@ -1,10 +1,10 @@
-﻿//211
+﻿//239
 // 
 // 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.5.211")]
-[assembly: AssemblyVersion("1.13.5.211")]
+[assembly: AssemblyFileVersion("1.13.5.239")]
+[assembly: AssemblyVersion("1.13.5.239")]
diff --git a/EssentialsPlugin/ChatHandlers/Admin/HandleAdminNotify.cs b/EssentialsPlugin/ChatHandlers/Admin/HandleAdminNotify.cs
@@ -4,8 +4,9 @@
 	using System.Linq;
 	using EssentialsPlugin.Utility;
 	using Sandbox.Common;
+	using VRage.Game;
 
-	public class HandleAdminNotify : ChatHandlerBase
+    public class HandleAdminNotify : ChatHandlerBase
 	{
 		public override string GetHelp()
 		{
diff --git a/EssentialsPlugin/ChatHandlers/Admin/HandleAdminOwnershipChange.cs b/EssentialsPlugin/ChatHandlers/Admin/HandleAdminOwnershipChange.cs
@@ -9,6 +9,8 @@
     using SEModAPIInternal.API.Entity.Sector.SectorObject.CubeGrid;
     using SEModAPIInternal.API.Entity.Sector.SectorObject.CubeGrid.CubeBlock;
     using VRage.ModAPI;
+    using VRage.Game;
+
     public class HandleAdminOwnershipChange : ChatHandlerBase
     {
         public override string GetHelp( )
@@ -102,7 +104,10 @@ public override bool HandleCommand( ulong userId, string[ ] words )
                 Communication.SendPrivateInformation( userId, string.Format( "Could not find entity with id {0}.", gridId ) );
                 return true;
             }
-            grid.ChangeGridOwnership( playerId, Sandbox.Common.ObjectBuilders.MyOwnershipShareModeEnum.Faction );
+            Wrapper.GameAction( ( ) =>
+                                {
+                                    grid.ChangeGridOwnership( playerId, MyOwnershipShareModeEnum.Faction );
+                                } );
             Communication.SendPrivateInformation( userId, string.Format( "Ownership changed to player {0}", name ) );
             return true;
         }
diff --git a/EssentialsPlugin/ChatHandlers/Admin/HandleAdminVersion.cs b/EssentialsPlugin/ChatHandlers/Admin/HandleAdminVersion.cs
@@ -18,7 +18,6 @@
     using VRageMath;
     using VRage.ModAPI;
     using VRage.Serialization;
-    using Sandbox.Common.ObjectBuilders.ComponentSystem;
 
     public class HandleAdminVersion : ChatHandlerBase
     {
diff --git a/EssentialsPlugin/ChatHandlers/AdminConceal/HandleAdminReveal.cs b/EssentialsPlugin/ChatHandlers/AdminConceal/HandleAdminReveal.cs
@@ -10,6 +10,7 @@
     using Sandbox.ModAPI;
     using SEModAPIInternal.API.Common;
     using SEModAPIInternal.API.Entity;
+    using VRage.Game;
     using VRage.ModAPI;
     using VRage.ObjectBuilders;
     using VRageMath;
diff --git a/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteCleanup.cs b/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteCleanup.cs
@@ -7,7 +7,9 @@
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Common;
 	using SEModAPIInternal.API.Entity.Sector.SectorObject;
+	using VRage.Game;
 	using VRage.ModAPI;
+    using VRage.Game.ObjectBuilders;
 
 	public class HandleAdminDeleteCleanup : ChatHandlerBase
 	{
diff --git a/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteGrids.cs b/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteGrids.cs
@@ -7,6 +7,7 @@
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Common;
 	using SEModAPIInternal.API.Entity;
+	using VRage.Game;
 	using VRage.ModAPI;
 
 	public class HandleAdminDeleteGrids : ChatHandlerBase
diff --git a/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteInactive.cs b/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteInactive.cs
@@ -8,6 +8,7 @@ namespace EssentialsPlugin.ChatHandlers.AdminDelete
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Common;
 	using SEModAPIInternal.API.Entity.Sector.SectorObject;
+	using VRage.Game;
 	using VRage.ModAPI;
 
 	public class HandleAdminDeleteInactive : ChatHandlerBase
diff --git a/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteNoBeacon.cs b/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteNoBeacon.cs
@@ -7,6 +7,7 @@
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Common;
     using SEModAPIInternal.API.Entity.Sector.SectorObject;
+	using VRage.Game;
 	using VRage.ModAPI;
 
 	public class HandleAdminDeleteNoBeacon : ChatHandlerBase
diff --git a/EssentialsPlugin/ChatHandlers/AdminMove/HandleAdminMoveAreaToPosition.cs b/EssentialsPlugin/ChatHandlers/AdminMove/HandleAdminMoveAreaToPosition.cs
@@ -9,6 +9,7 @@
 	using SEModAPIInternal.API.Entity;
 	using SEModAPIInternal.API.Entity.Sector.SectorObject;
 	using VRage;
+	using VRage.Game;
 	using VRage.ModAPI;
 	using VRageMath;
 
diff --git a/EssentialsPlugin/ChatHandlers/AdminMove/HandleAdminMoveAreaTowards.cs b/EssentialsPlugin/ChatHandlers/AdminMove/HandleAdminMoveAreaTowards.cs
@@ -9,6 +9,7 @@
 	using SEModAPIInternal.API.Entity;
 	using SEModAPIInternal.API.Entity.Sector.SectorObject;
 	using VRage;
+	using VRage.Game;
 	using VRage.ModAPI;
 	using VRageMath;
 
diff --git a/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayer.cs b/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayer.cs
@@ -6,6 +6,7 @@
 	using Sandbox.Common.ObjectBuilders;
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Common;
+	using VRage.Game;
 	using VRage.ModAPI;
 
 	public class HandleAdminPlayer : ChatHandlerBase
diff --git a/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayerCleanup.cs b/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayerCleanup.cs
@@ -6,6 +6,7 @@
 	using Sandbox.Common.ObjectBuilders.Definitions;
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Common;
+	using VRage.Game;
 	using VRage.ModAPI;
 
 	public class HandleAdminPlayerCleanup : ChatHandlerBase
diff --git a/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayerListActive.cs b/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayerListActive.cs
@@ -6,8 +6,9 @@
 	using EssentialsPlugin.Utility;
 	using Sandbox.Common.ObjectBuilders;
 	using SEModAPIInternal.API.Common;
+	using VRage.Game;
 
-	public class HandleAdminPlayerListActive : ChatHandlerBase
+    public class HandleAdminPlayerListActive : ChatHandlerBase
 	{
 		public override string GetHelp()
 		{
diff --git a/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayerListInactive.cs b/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayerListInactive.cs
@@ -6,8 +6,9 @@
 	using EssentialsPlugin.Utility;
 	using Sandbox.Common.ObjectBuilders;
 	using SEModAPIInternal.API.Common;
+	using VRage.Game;
 
-	public class HandleAdminPlayerListInactive : ChatHandlerBase
+    public class HandleAdminPlayerListInactive : ChatHandlerBase
 	{
 		public override string GetHelp()
 		{
diff --git a/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanAreaAt.cs b/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanAreaAt.cs
@@ -5,6 +5,7 @@
 	using EssentialsPlugin.Utility;
 	using Sandbox.Common.ObjectBuilders;
 	using Sandbox.ModAPI;
+	using VRage.Game;
 	using VRage.ModAPI;
 	using VRageMath;
 
diff --git a/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanAreaTowards.cs b/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanAreaTowards.cs
@@ -5,6 +5,7 @@
 	using EssentialsPlugin.Utility;
 	using Sandbox.Common.ObjectBuilders;
 	using Sandbox.ModAPI;
+	using VRage.Game;
 	using VRage.ModAPI;
 	using VRageMath;
 
diff --git a/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanInactive.cs b/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanInactive.cs
@@ -9,6 +9,7 @@ namespace EssentialsPlugin.ChatHandlers
     using Sandbox.ModAPI;
     using SEModAPIInternal.API.Common;
     using SEModAPIInternal.API.Entity.Sector.SectorObject;
+    using VRage.Game;
     using VRage.ModAPI;
     using VRage.ObjectBuilders;
     public class HandleAdminScanInactive : ChatHandlerBase
diff --git a/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanNoBeacon.cs b/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanNoBeacon.cs
@@ -7,6 +7,7 @@
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Common;
 	using SEModAPIInternal.API.Entity.Sector.SectorObject;
+	using VRage.Game;
 	using VRage.ModAPI;
 
 	public class HandleAdminScanNoBeacon : ChatHandlerBase
diff --git a/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanOverlimit.cs b/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanOverlimit.cs
@@ -7,6 +7,7 @@
 	using Sandbox.Common.ObjectBuilders;
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Common;
+	using VRage.Game;
 	using VRage.ModAPI;
 
 	public class HandleAdminScanOverlimit : ChatHandlerBase
diff --git a/EssentialsPlugin/ChatHandlers/Dock/HandleAdminUndockAll.cs b/EssentialsPlugin/ChatHandlers/Dock/HandleAdminUndockAll.cs
@@ -11,6 +11,7 @@
     using Sandbox.ModAPI;
     using SEModAPIInternal.API.Entity;
     using VRage;
+    using VRage.Game;
     using VRage.ModAPI;
     using VRage.ObjectBuilders;
     using VRageMath;
diff --git a/EssentialsPlugin/ChatHandlers/Dock/HandleDockDock.cs b/EssentialsPlugin/ChatHandlers/Dock/HandleDockDock.cs
@@ -12,6 +12,7 @@
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Common;
 	using SEModAPIInternal.API.Entity;
+	using VRage.Game;
 	using VRage.ModAPI;
 	using VRage.ObjectBuilders;
 	using VRageMath;
diff --git a/EssentialsPlugin/ChatHandlers/Dock/HandleDockUndock.cs b/EssentialsPlugin/ChatHandlers/Dock/HandleDockUndock.cs
@@ -13,6 +13,7 @@
     using SEModAPIInternal.API.Common;
     using SEModAPIInternal.API.Entity;
     using VRage;
+    using VRage.Game;
     using VRage.ModAPI;
     using VRage.ObjectBuilders;
     using VRageMath;
diff --git a/EssentialsPlugin/ChatHandlers/Leaderboard/HandleLeaderboardConquest.cs b/EssentialsPlugin/ChatHandlers/Leaderboard/HandleLeaderboardConquest.cs
@@ -5,8 +5,9 @@
 	using EssentialsPlugin.Utility;
 	using Sandbox.Common.ObjectBuilders;
 	using SEModAPIInternal.API.Common;
+	using VRage.Game;
 
-	public class HandleLeaderboardConquest : ChatHandlerBase
+    public class HandleLeaderboardConquest : ChatHandlerBase
 	{
 		public override string GetHelp()
 		{
diff --git a/EssentialsPlugin/ChatHandlers/Utility/HandleUtilityGridsList.cs b/EssentialsPlugin/ChatHandlers/Utility/HandleUtilityGridsList.cs
@@ -10,8 +10,9 @@
 	using VRage.ModAPI;
 	using VRageMath;
     using Sandbox.Game;
+	using VRage.Game;
 
-	public class HandleUtilityGridsList : ChatHandlerBase
+    public class HandleUtilityGridsList : ChatHandlerBase
 	{
 		public override string GetHelp()
 		{
diff --git a/EssentialsPlugin/EntityManagers/BlockManagement.cs b/EssentialsPlugin/EntityManagers/BlockManagement.cs
@@ -11,6 +11,7 @@
 	using Sandbox.Common.ObjectBuilders;
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Entity.Sector.SectorObject.CubeGrid.CubeBlock;
+	using VRage.Game;
 	using VRage.ModAPI;
 
 	public class BlockManagement
diff --git a/EssentialsPlugin/GameModes/Conquest.cs b/EssentialsPlugin/GameModes/Conquest.cs
@@ -11,6 +11,7 @@
 	using Sandbox.Common.ObjectBuilders;
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Common;
+	using VRage.Game;
 	using VRage.ModAPI;
 	using VRageMath;
 
diff --git a/EssentialsPlugin/ProcessHandlers/ProcessDockingZone.cs b/EssentialsPlugin/ProcessHandlers/ProcessDockingZone.cs
@@ -6,6 +6,7 @@
 	using Sandbox.Common;
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Common;
+	using VRage.Game;
 	using VRage.ModAPI;
 	using VRageMath;
 
diff --git a/EssentialsPlugin/ProcessHandlers/ProcessNewUserTransport.cs b/EssentialsPlugin/ProcessHandlers/ProcessNewUserTransport.cs
@@ -10,6 +10,7 @@
 	using SEModAPIInternal.API.Common;
 	using SEModAPIInternal.API.Entity;
 	using SEModAPIInternal.API.Entity.Sector.SectorObject;
+	using VRage.Game;
 	using VRage.ModAPI;
 	using VRageMath;
 
diff --git a/EssentialsPlugin/ProcessHandlers/ProcessRespawn.cs b/EssentialsPlugin/ProcessHandlers/ProcessRespawn.cs
@@ -6,6 +6,7 @@
 	using Sandbox.Common.ObjectBuilders;
 	using Sandbox.ModAPI;
 	using SEModAPIInternal.API.Server;
+	using VRage.Game;
 	using VRage.ModAPI;
 
 	public class ProcessRespawn : ProcessHandlerBase
diff --git a/EssentialsPlugin/ProcessHandlers/ProcessRestart.cs b/EssentialsPlugin/ProcessHandlers/ProcessRestart.cs
@@ -4,6 +4,7 @@
 	using System.Collections.Generic;
 	using System.Diagnostics;
 	using System.IO;
+	using System.Net;
 	using System.Threading;
 	using System.Windows.Forms;
 	using EssentialsPlugin.Settings;
@@ -12,6 +13,7 @@
 	using Sandbox.ModAPI;
 	using SEModAPIExtensions.API;
 	using SEModAPIInternal.API.Common;
+	using SteamSDK;
 	using VRage.ModAPI;
 	using VRageMath;
 
@@ -21,8 +23,9 @@ class ProcessRestart : ProcessHandlerBase
 
 		private DateTime m_start;
 		private int m_done = -1;
+	    private bool _init;
 
-		static public DateTime? ForcedRestart
+        static public DateTime? ForcedRestart
 		{
 			get { return m_forcedRestart; }
 			set { m_forcedRestart = value; }
@@ -39,8 +42,8 @@ public override int GetUpdateResolution()
 		{
 			return 10000;
 		}
-
-		public override void Handle()
+        
+	    public override void Handle()
 		{
 			if (PluginSettings.Instance.RestartWhenUnresponsive)
 				CheckResponse();
@@ -50,12 +53,11 @@ public override void Handle()
 
 			SetRestartTime();
 			if(m_done < 0)
-				return;
-
-
-			//Log.Info(string.Format("Restart in {0} minutes", m_done));
+                return;
+            
+            //Log.Info(string.Format("Restart in {0} minutes", m_done));
 
-			if (DateTime.Now - m_start > TimeSpan.FromMinutes(m_done))
+            if ( DateTime.Now - m_start > TimeSpan.FromMinutes(m_done))
 			{
 				DoRestart();
 				return;
diff --git a/EssentialsPlugin/Settings/SettingsTimedCommandItem.cs b/EssentialsPlugin/Settings/SettingsTimedCommandItem.cs
@@ -30,9 +30,9 @@ public string CommandTime
 
         public int WarningTime { get; set; }
 
-        public bool HasWarned { get; set; }
+        public bool HasWarned;
 
-        public bool HasRun { get; set; }
+        public bool HasRun;
 
     }
 }
diff --git a/EssentialsPlugin/Utility/CargoShips.cs b/EssentialsPlugin/Utility/CargoShips.cs
diff --git a/EssentialsPlugin/Utility/Communication.cs b/EssentialsPlugin/Utility/Communication.cs
diff --git a/EssentialsPlugin/Utility/DockingZone.cs b/EssentialsPlugin/Utility/DockingZone.cs
diff --git a/EssentialsPlugin/Utility/Player.cs b/EssentialsPlugin/Utility/Player.cs
diff --git a/EssentialsPlugin/Utility/Protection.cs b/EssentialsPlugin/Utility/Protection.cs
diff --git a/EssentialsPlugin/Utility/TimedEntityCleanup.cs b/EssentialsPlugin/Utility/TimedEntityCleanup.cs

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using EssentialsPlugin.Utility;`
`6`	`6`	`using Sandbox.Common;`
	`7`	`+ using VRage.Game;`
`7`	`8`
`8`		`- public class HandleAdminNotify : ChatHandlerBase`
	`9`	`+ public class HandleAdminNotify : ChatHandlerBase`
`9`	`10`	`{`
`10`	`11`	`public override string GetHelp()`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`using VRageMath;`
`19`	`19`	`using VRage.ModAPI;`
`20`	`20`	`using VRage.Serialization;`
`21`		`- using Sandbox.Common.ObjectBuilders.ComponentSystem;`
`22`	`21`
`23`	`22`	`public class HandleAdminVersion : ChatHandlerBase`
`24`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,9 @@`
`7`	`7`	`using Sandbox.ModAPI;`
`8`	`8`	`using SEModAPIInternal.API.Common;`
`9`	`9`	`using SEModAPIInternal.API.Entity.Sector.SectorObject;`
	`10`	`+ using VRage.Game;`
`10`	`11`	`using VRage.ModAPI;`
	`12`	`+ using VRage.Game.ObjectBuilders;`
`11`	`13`
`12`	`14`	`public class HandleAdminDeleteCleanup : ChatHandlerBase`
`13`	`15`	`{`