Fix chat crash. Refactor reserved slot system. Admins and whitelisted…

… players can simply bypass the player limit set on the server.
SEServerExtender · Jun 1, 2017 · eccb2b8 · eccb2b8
1 parent 6835df0
commit eccb2b8
Show file tree

Hide file tree

Showing 7 changed files with 248 additions and 305 deletions.
diff --git a/EssentialsPlugin.sln.DotSettings b/EssentialsPlugin.sln.DotSettings
diff --git a/EssentialsPlugin/AssemblyFileVersion.cs b/EssentialsPlugin/AssemblyFileVersion.cs
@@ -1,10 +1,10 @@
-//421
+//430
 // 
 // 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.421")]
-[assembly: AssemblyVersion("1.13.7.421")]
+[assembly: AssemblyFileVersion("1.13.7.430")]
+[assembly: AssemblyVersion("1.13.7.430")]
diff --git a/EssentialsPlugin/Essentials.cs b/EssentialsPlugin/Essentials.cs
@@ -951,21 +951,21 @@ public bool ReservedSlotsEnabled
             }
         }
 
-        [Category( "Reserved Slots" )]
-        [Description( "Number of slots to reserve." )]
-        [Browsable( true )]
-        [ReadOnly( false )]
-        public int ReservedSlotsCount
-        {
-            get
-            {
-                return PluginSettings.Instance.ReservedSlotsCount;
-            }
-            set
-            {
-                PluginSettings.Instance.ReservedSlotsCount = value;
-            }
-        }
+        //[Category( "Reserved Slots" )]
+        //[Description( "Number of slots to reserve." )]
+        //[Browsable( true )]
+        //[ReadOnly( false )]
+        //public int ReservedSlotsCount
+        //{
+        //    get
+        //    {
+        //        return PluginSettings.Instance.ReservedSlotsCount;
+        //    }
+        //    set
+        //    {
+        //        PluginSettings.Instance.ReservedSlotsCount = value;
+        //    }
+        //}
 
         [Category( "Reserved Slots" )]
         [Description( "Group ID number. Players in this group can occupy a reserved slot." )]

diff --git a/EssentialsPlugin/NetworkHandlers/SyncPropertyHandler.cs b/EssentialsPlugin/NetworkHandlers/SyncPropertyHandler.cs
@@ -61,44 +61,44 @@ public override bool Handle( ulong remoteUserId, CallSite site, BitStream stream
         {
             //TODO
             return false;
-            MyPropertySyncStateGroup sync = (MyPropertySyncStateGroup)obj;
+            //MyPropertySyncStateGroup sync = (MyPropertySyncStateGroup)obj;
 
-            var properties = (ListReader<SyncBase>)sync.GetType().GetField("m_properties", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(sync);
+            //var properties = (ListReader<SyncBase>)sync.GetType().GetField("m_properties", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(sync);
 
-            byte index = 0;
-            BitReaderWriter bits = new BitReaderWriter();
+            //byte index = 0;
+            //BitReaderWriter bits = new BitReaderWriter();
 
-            Serialize(site.MethodInfo, stream, ref index, ref bits);
+            //Serialize(site.MethodInfo, stream, ref index, ref bits);
 
-            MyTerminalBlock entity = null;
+            //MyTerminalBlock entity = null;
 
-            MyExternalReplicable<MySyncedBlock> rep = sync.Owner as MyExternalReplicable<MySyncedBlock>;
+            //MyExternalReplicable<MySyncedBlock> rep = sync.Owner as MyExternalReplicable<MySyncedBlock>;
 
-            if ( rep == null )
-            {
-                //there are lots of reasons this wouldn't be MySyncedBlock, so just ignore it and move on
-                return false;
-            }
+            //if ( rep == null )
+            //{
+            //    //there are lots of reasons this wouldn't be MySyncedBlock, so just ignore it and move on
+            //    return false;
+            //}
 
-            entity = rep.Instance as MyTerminalBlock;
+            //entity = rep.Instance as MyTerminalBlock;
 
-            MyCubeGrid grid = entity?.CubeGrid;
+            //MyCubeGrid grid = entity?.CubeGrid;
 
-            if ( grid == null )
-            {
-                Essentials.Log.Info( "Null grid in SyncPropertyHandler" );
-                return false;
-            }
+            //if ( grid == null )
+            //{
+            //    Essentials.Log.Info( "Null grid in SyncPropertyHandler" );
+            //    return false;
+            //}
 
 
-            Essentials.Log.Warn( $"{entity.CustomName} | {index} | {properties[index].ValueType}" );
+            //Essentials.Log.Warn( $"{entity.CustomName} | {index} | {properties[index].ValueType}" );
 
-            if (entity is MyLandingGear)
-            {
-                //clients sometimes send updates for landing gear for no discernable reason?
-                //just ignore it, it's mostly harmless
-                return false;
-            }
+            //if (entity is MyLandingGear)
+            //{
+            //    //clients sometimes send updates for landing gear for no discernable reason?
+            //    //just ignore it, it's mostly harmless
+            //    return false;
+            //}
 
             //bool found = false;
             //foreach ( ProtectedItem item in PluginSettings.Instance.ProtectedItems )