Fixed /admin reveal, fixed DynamicConcealProduction actually toggline…

… DynamicConcealIncludeMedbays
SEServerExtender · Jun 16, 2016 · aaa4263 · aaa4263
1 parent 9551a33
commit aaa4263
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/EssentialsPlugin/AssemblyFileVersion.cs b/EssentialsPlugin/AssemblyFileVersion.cs
@@ -1,10 +1,10 @@
-//14
+//21
 // 
 // 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.7.14")]
-[assembly: AssemblyVersion("1.13.7.14")]
+[assembly: AssemblyFileVersion("1.13.7.21")]
+[assembly: AssemblyVersion("1.13.7.21")]
diff --git a/EssentialsPlugin/EntityManagers/EntityManagement.cs b/EssentialsPlugin/EntityManagers/EntityManagement.cs
@@ -571,9 +571,16 @@ static public void RevealAll( )
 
  CheckAndRevealEntitiesObsolete();
 
- foreach ( var entity in UnregisteredEntities.ToArray() )
+ HashSet<MyEntity> entities = new HashSet<MyEntity>();
+ Wrapper.GameAction( ()=>entities = MyEntities.GetEntities() );
+
+ foreach ( var entity in entities )
  {
- if (PluginSettings.Instance.DynamicShowMessages)
+ var grid = entity as MyCubeGrid;
+ if ( grid == null )
+ continue;
+
+ if (PluginSettings.Instance.DynamicShowMessages && UnregisteredEntities.Contains( entity ))
  Essentials.Log.Info("Revealed - Id: {0} -> Display: {1} OwnerId: {2} OwnerName: {3} Reason: {4}",
  entity.EntityId,
  entity.DisplayName.Replace("\r", "").Replace("\n", ""),
@@ -584,6 +591,7 @@ static public void RevealAll( )
  Wrapper.GameAction( () => ReregisterHierarchy( entity ) );
  }
 
+ UnregisteredEntities.Clear();
  _checkReveal = false;
  }
 

diff --git a/EssentialsPlugin/Essentials.cs b/EssentialsPlugin/Essentials.cs
@@ -729,8 +729,8 @@ public bool DynamicConcealIncludeMedBays
  [ReadOnly(false)]
  public bool DynamicConcealProduction
  {
- get { return PluginSettings.Instance.DynamicConcealIncludeMedBays; }
- set { PluginSettings.Instance.DynamicConcealIncludeMedBays = value; }
+ get { return PluginSettings.Instance.DynamicConcealProduction; }
+ set { PluginSettings.Instance.DynamicConcealProduction = value; }
  }
 
  [Category( "Dynamic Entity Management" )]