Update for 1.126

SEServerExtender · Mar 17, 2016 · 1b2da85 · 1b2da85
1 parent e427f54
commit 1b2da85
Show file tree

Hide file tree

Showing 63 changed files with 226 additions and 67 deletions.
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 @@
-//268
+//281
 // 
 // 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.268")]
-[assembly: AssemblyVersion("1.13.5.268")]
+[assembly: AssemblyFileVersion("1.13.5.281")]
+[assembly: AssemblyVersion("1.13.5.281")]
diff --git a/EssentialsPlugin/ChatHandlers/Admin/HandleAdminIdentityCleanup.cs b/EssentialsPlugin/ChatHandlers/Admin/HandleAdminIdentityCleanup.cs
@@ -0,0 +1,75 @@
+namespace EssentialsPlugin.ChatHandlers.Admin
+{
+ using System.Collections.Generic;
+ using System.Linq;
+ using Sandbox.Game.Multiplayer;
+ using Sandbox.Game.World;
+ using Sandbox.ModAPI;
+ using Utility;
+ public class HandleAdminIdentityCleanup : ChatHandlerBase
+ {
+
+ public override string GetHelp()
+ {
+ return "For testing.";
+ }
+
+ public override string GetCommandText()
+ {
+ return "/admin identity cleanup";
+ }
+
+ public override Communication.ServerDialogItem GetHelpDialog( )
+ {
+ Communication.ServerDialogItem DialogItem = new Communication.ServerDialogItem( );
+ DialogItem.title = "Help";
+ DialogItem.header = "";
+ DialogItem.content = GetHelp( );
+ DialogItem.buttonText = "close";
+ return DialogItem;
+ }
+
+ public override bool IsAdminCommand()
+ {
+ return true;
+ }
+
+ public override bool AllowedInConsole()
+ {
+ return true;
+ }
+
+ public override bool HandleCommand( ulong userId, string[ ] words )
+ {/*
+ MyPlayerCollection playerCollection = MyAPIGateway.Players as MyPlayerCollection;
+
+ if ( playerCollection == null )
+ return true;
+
+ var identities = playerCollection.GetAllIdentities( ).GroupBy( x => x.DisplayName ).Where( y => y.Count( ) > 1 ).ToList( );
+
+ while ( identities.Count > 0 )
+ {
+ string compareName = identities[0].Key;
+ var toDelete = identities.Where(x => x. )
+ }
+
+ int count = identitiesToDelete.Count;
+ foreach(MyIdentity toDelete in identitiesToDelete)
+ {
+ Essentials.Log.Info( $"Deleted dead identity {toDelete.DisplayName}" );
+ playerCollection.RemoveIdentity( toDelete.IdentityId );
+ }
+
+ if ( count != 0 )
+ {
+ Essentials.Log.Info( $"Deleted {count} dead identities." );
+ }
+ */
+ return true;
+ }
+
+ }
+
+}
+
diff --git a/EssentialsPlugin/ChatHandlers/Admin/HandleAdminOwnershipChange.cs b/EssentialsPlugin/ChatHandlers/Admin/HandleAdminOwnershipChange.cs
@@ -10,6 +10,7 @@
  using SEModAPIInternal.API.Entity.Sector.SectorObject.CubeGrid.CubeBlock;
  using VRage.ModAPI;
  using VRage.Game;
+ using VRage.Game.ModAPI;
 
  public class HandleAdminOwnershipChange : ChatHandlerBase
  {

diff --git a/EssentialsPlugin/ChatHandlers/Admin/HandleAdminStop.cs b/EssentialsPlugin/ChatHandlers/Admin/HandleAdminStop.cs
@@ -13,6 +13,8 @@
  using VRageMath;
  using Sandbox.Game.Entities;
  using Sandbox.Game.Entities.Cube;
+ using VRage.Game.ModAPI;
+
  public class HandleAdminStop : ChatHandlerBase
  {
  public override string GetHelp( )

diff --git a/EssentialsPlugin/ChatHandlers/Admin/HandleAdminTurrets.cs b/EssentialsPlugin/ChatHandlers/Admin/HandleAdminTurrets.cs
@@ -5,11 +5,13 @@
  using EssentialsPlugin.Utility;
  using Sandbox.Common;
  using Sandbox.Common.ObjectBuilders;
+ using Sandbox.Game.Entities;
  using Sandbox.ModAPI;
  using Sandbox.ModAPI.Interfaces;
  using SEModAPIInternal.API.Common;
  using SEModAPIInternal.API.Entity.Sector.SectorObject.CubeGrid.CubeBlock;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRageMath;
 

diff --git a/EssentialsPlugin/ChatHandlers/AdminConceal/HandleAdminConceal.cs b/EssentialsPlugin/ChatHandlers/AdminConceal/HandleAdminConceal.cs
@@ -8,6 +8,7 @@
  using SEModAPIInternal.API.Common;
  using VRage.ModAPI;
  using EntityManagers;
+ using VRage.Game.ModAPI;
 
  public class HandleAdminConceal : ChatHandlerBase
  {

diff --git a/EssentialsPlugin/ChatHandlers/AdminConceal/HandleAdminReveal.cs b/EssentialsPlugin/ChatHandlers/AdminConceal/HandleAdminReveal.cs
@@ -11,6 +11,7 @@
  using SEModAPIInternal.API.Common;
  using SEModAPIInternal.API.Entity;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRage.ObjectBuilders;
  using VRageMath;

diff --git a/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteCleanup.cs b/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteCleanup.cs
@@ -8,6 +8,7 @@
  using SEModAPIInternal.API.Common;
  using SEModAPIInternal.API.Entity.Sector.SectorObject;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRage.Game.ObjectBuilders;
 

diff --git a/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteFloating.cs b/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteFloating.cs
@@ -11,6 +11,7 @@
  using SEModAPIInternal.API.Entity.Sector.SectorObject;
  using SEModAPIInternal.API.Entity.Sector.SectorObject.CubeGrid;
  using SEModAPIInternal.API.Entity.Sector.SectorObject.CubeGrid.CubeBlock;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  public class HandleAdminDeleteFloating : ChatHandlerBase
  {
@@ -58,7 +59,7 @@ public override bool HandleCommand( ulong userId, string[ ] words )
  if ( entity == null )
  continue;
 
- if ( entity is IMyFloatingObject || entity is MyInventoryBagEntity )
+ if ( entity is IMyFloatingObject || entity is MyInventoryBagEntity || entity is IMyMeteor )
  {
  count++;
  Wrapper.GameAction(()=>

diff --git a/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteGrids.cs b/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteGrids.cs
@@ -8,6 +8,7 @@
  using SEModAPIInternal.API.Common;
  using SEModAPIInternal.API.Entity;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
 
  public class HandleAdminDeleteGrids : ChatHandlerBase

diff --git a/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteInactive.cs b/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteInactive.cs
@@ -9,6 +9,7 @@ namespace EssentialsPlugin.ChatHandlers.AdminDelete
  using SEModAPIInternal.API.Common;
  using SEModAPIInternal.API.Entity.Sector.SectorObject;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
 
  public class HandleAdminDeleteInactive : ChatHandlerBase

diff --git a/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteNoBeacon.cs b/EssentialsPlugin/ChatHandlers/AdminDelete/HandleAdminDeleteNoBeacon.cs
@@ -8,6 +8,7 @@
  using SEModAPIInternal.API.Common;
  using SEModAPIInternal.API.Entity.Sector.SectorObject;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
 
  public class HandleAdminDeleteNoBeacon : ChatHandlerBase

diff --git a/EssentialsPlugin/ChatHandlers/AdminMove/HandleAdminMoveAreaToPosition.cs b/EssentialsPlugin/ChatHandlers/AdminMove/HandleAdminMoveAreaToPosition.cs
@@ -10,6 +10,7 @@
  using SEModAPIInternal.API.Entity.Sector.SectorObject;
  using VRage;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRageMath;
 

diff --git a/EssentialsPlugin/ChatHandlers/AdminMove/HandleAdminMoveAreaTowards.cs b/EssentialsPlugin/ChatHandlers/AdminMove/HandleAdminMoveAreaTowards.cs
@@ -10,6 +10,7 @@
  using SEModAPIInternal.API.Entity.Sector.SectorObject;
  using VRage;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRageMath;
 

diff --git a/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayer.cs b/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayer.cs
@@ -7,6 +7,7 @@
  using Sandbox.ModAPI;
  using SEModAPIInternal.API.Common;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
 
  public class HandleAdminPlayer : ChatHandlerBase

diff --git a/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayerCleanup.cs b/EssentialsPlugin/ChatHandlers/AdminPlayer/HandleAdminPlayerCleanup.cs
@@ -7,6 +7,7 @@
  using Sandbox.ModAPI;
  using SEModAPIInternal.API.Common;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
 
  public class HandleAdminPlayerCleanup : ChatHandlerBase

diff --git a/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanAreaAt.cs b/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanAreaAt.cs
@@ -6,6 +6,7 @@
  using Sandbox.Common.ObjectBuilders;
  using Sandbox.ModAPI;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRageMath;
 

diff --git a/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanAreaTowards.cs b/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanAreaTowards.cs
@@ -6,6 +6,7 @@
  using Sandbox.Common.ObjectBuilders;
  using Sandbox.ModAPI;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRageMath;
 

diff --git a/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanInactive.cs b/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanInactive.cs
@@ -10,6 +10,7 @@ namespace EssentialsPlugin.ChatHandlers
  using SEModAPIInternal.API.Common;
  using SEModAPIInternal.API.Entity.Sector.SectorObject;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRage.ObjectBuilders;
  public class HandleAdminScanInactive : ChatHandlerBase

diff --git a/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanNoBeacon.cs b/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanNoBeacon.cs
@@ -8,6 +8,7 @@
  using SEModAPIInternal.API.Common;
  using SEModAPIInternal.API.Entity.Sector.SectorObject;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
 
  public class HandleAdminScanNoBeacon : ChatHandlerBase

diff --git a/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanOverlimit.cs b/EssentialsPlugin/ChatHandlers/AdminScan/HandleAdminScanOverlimit.cs
@@ -8,6 +8,7 @@
  using Sandbox.ModAPI;
  using SEModAPIInternal.API.Common;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
 
  public class HandleAdminScanOverlimit : ChatHandlerBase

diff --git a/EssentialsPlugin/ChatHandlers/Dock/HandleAdminUndockAll.cs b/EssentialsPlugin/ChatHandlers/Dock/HandleAdminUndockAll.cs
@@ -12,6 +12,7 @@
  using SEModAPIInternal.API.Entity;
  using VRage;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRage.ObjectBuilders;
  using VRageMath;

diff --git a/EssentialsPlugin/ChatHandlers/Dock/HandleDockDock.cs b/EssentialsPlugin/ChatHandlers/Dock/HandleDockDock.cs
@@ -13,6 +13,7 @@
  using SEModAPIInternal.API.Common;
  using SEModAPIInternal.API.Entity;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRage.ObjectBuilders;
  using VRageMath;

diff --git a/EssentialsPlugin/ChatHandlers/Dock/HandleDockList.cs b/EssentialsPlugin/ChatHandlers/Dock/HandleDockList.cs
@@ -6,8 +6,9 @@
  using EssentialsPlugin.Utility;
  using Sandbox.ModAPI;
  using SEModAPIInternal.API.Common;
+ using VRage.Game.ModAPI;
 
- public class HandleDockList : ChatHandlerBase
+ public class HandleDockList : ChatHandlerBase
  {
  public override string GetHelp()
  {

diff --git a/EssentialsPlugin/ChatHandlers/Dock/HandleDockUndock.cs b/EssentialsPlugin/ChatHandlers/Dock/HandleDockUndock.cs
@@ -14,6 +14,7 @@
  using SEModAPIInternal.API.Entity;
  using VRage;
  using VRage.Game;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRage.ObjectBuilders;
  using VRageMath;

diff --git a/EssentialsPlugin/ChatHandlers/Dock/HandleDockValidate.cs b/EssentialsPlugin/ChatHandlers/Dock/HandleDockValidate.cs
@@ -6,8 +6,9 @@
  using EssentialsPlugin.Utility;
  using Sandbox.ModAPI;
  using SEModAPIInternal.API.Common;
+ using VRage.Game.ModAPI;
 
- public class HandleDockValidate : ChatHandlerBase
+ public class HandleDockValidate : ChatHandlerBase
  {
  public override string GetHelp()
  {

diff --git a/EssentialsPlugin/ChatHandlers/HandleMotd.cs b/EssentialsPlugin/ChatHandlers/HandleMotd.cs
@@ -6,8 +6,9 @@
  using EssentialsPlugin.Settings;
  using EssentialsPlugin.Utility;
  using Sandbox.ModAPI;
+ using VRage.Game.ModAPI;
 
- public class HandleMotd : ChatHandlerBase
+ public class HandleMotd : ChatHandlerBase
  {
  DateTime m_start = DateTime.Now;
 

diff --git a/EssentialsPlugin/ChatHandlers/HandlePos.cs b/EssentialsPlugin/ChatHandlers/HandlePos.cs
@@ -4,6 +4,7 @@
  using System.Linq;
  using EssentialsPlugin.Utility;
  using Sandbox.ModAPI;
+ using VRage.Game.ModAPI;
  using VRageMath;
 
  public class HandlePos : ChatHandlerBase

diff --git a/EssentialsPlugin/ChatHandlers/Utility/HandleUtilityExportServer.cs b/EssentialsPlugin/ChatHandlers/Utility/HandleUtilityExportServer.cs
@@ -12,6 +12,7 @@
  using SEModAPIInternal.API.Common;
  using SEModAPIInternal.API.Entity;
  using VRage.FileSystem;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRage.ObjectBuilders;
 

diff --git a/EssentialsPlugin/ChatHandlers/Utility/HandleUtilityGridsCompare.cs b/EssentialsPlugin/ChatHandlers/Utility/HandleUtilityGridsCompare.cs
@@ -5,6 +5,7 @@
  using System.Linq;
  using EssentialsPlugin.Utility;
  using Sandbox.ModAPI;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
 
  public class HandleUtilityGridsCompare : ChatHandlerBase

diff --git a/EssentialsPlugin/ChatHandlers/Utility/HandleUtilityGridsList.cs b/EssentialsPlugin/ChatHandlers/Utility/HandleUtilityGridsList.cs
@@ -11,6 +11,7 @@
  using VRageMath;
  using Sandbox.Game;
  using VRage.Game;
+ using VRage.Game.ModAPI;
 
  public class HandleUtilityGridsList : ChatHandlerBase
  {

diff --git a/EssentialsPlugin/ChatHandlers/Waypoints/HandleWaypointFactionAdd.cs b/EssentialsPlugin/ChatHandlers/Waypoints/HandleWaypointFactionAdd.cs
@@ -6,6 +6,7 @@
  using EssentialsPlugin.Utility;
  using Sandbox.ModAPI;
  using SEModAPIInternal.API.Common;
+ using VRage.Game.ModAPI;
  using VRage.ModAPI;
  using VRageMath;
 

diff --git a/EssentialsPlugin/ChatHandlers/Waypoints/HandleWaypointFactionRemove.cs b/EssentialsPlugin/ChatHandlers/Waypoints/HandleWaypointFactionRemove.cs
@@ -5,8 +5,9 @@
  using EssentialsPlugin.Utility;
  using Sandbox.ModAPI;
  using SEModAPIInternal.API.Common;
+ using VRage.Game.ModAPI;
 
- public class HandleWaypointFactionRemove : ChatHandlerBase
+ public class HandleWaypointFactionRemove : ChatHandlerBase
  {
  public override string GetHelp()
  {

diff --git a/EssentialsPlugin/ChatHandlers/Waypoints/HandleWaypointGroupAdd.cs b/EssentialsPlugin/ChatHandlers/Waypoints/HandleWaypointGroupAdd.cs
@@ -5,8 +5,9 @@
  using EssentialsPlugin.Utility;
  using Sandbox.ModAPI;
  using SEModAPIInternal.API.Common;
+ using VRage.Game.ModAPI;
 
- public class HandleWaypointGroupAdd : ChatHandlerBase
+ public class HandleWaypointGroupAdd : ChatHandlerBase
  {
  public override string GetHelp()
  {

diff --git a/EssentialsPlugin/ChatHandlers/Waypoints/HandleWaypointGroupRemove.cs b/EssentialsPlugin/ChatHandlers/Waypoints/HandleWaypointGroupRemove.cs
@@ -5,8 +5,9 @@
  using EssentialsPlugin.Utility;
  using Sandbox.ModAPI;
  using SEModAPIInternal.API.Common;
+ using VRage.Game.ModAPI;
 
- public class HandleWaypointGroupRemove : ChatHandlerBase
+ public class HandleWaypointGroupRemove : ChatHandlerBase
  {
  public override string GetHelp()
  {

diff --git a/EssentialsPlugin/ChatHandlers/Waypoints/HandleWaypointList.cs b/EssentialsPlugin/ChatHandlers/Waypoints/HandleWaypointList.cs
@@ -5,8 +5,9 @@
  using EssentialsPlugin.Utility;
  using Sandbox.ModAPI;
  using SEModAPIInternal.API.Common;
+ using VRage.Game.ModAPI;
 
- public class HandleWaypointList : ChatHandlerBase
+ public class HandleWaypointList : ChatHandlerBase
  {
  public override string GetHelp()
  {