Changeset 198 for binary-improvements/7dtd-server-fixes/src

Timestamp:

Sep 22, 2014, 11:54:56 AM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes/src

Files:

• AllocsLogFunctions.cs (modified) (1 diff)
• CommandExtensions.cs (modified) (2 diffs)
• PersistentData/Player.cs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs

@@ -42 +42 @@
                                 if (p != null) {
                                         p.SetOffline ();
+                                } else {
+                                        Log.Out ("Disconnected player not found in client list...");
                                 }
                                 PersistentData.PersistentContainer.Instance.Save ();

binary-improvements/7dtd-server-fixes/src/CommandExtensions.cs

@@ -2 +2 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 
 namespace AllocsFixes
@@ -11 +12 @@
                         try {
                                 ConsoleSdtd cons = manager.m_GUIConsole;
-                                cons.AddCommand (new CreativeMenu (cons));
-                                cons.AddCommand (new EnableRendering (cons));
-                                cons.AddCommand (new GetGamePrefs (cons));
-                                cons.AddCommand (new GetTime (cons));
-                                cons.AddCommand (new Give (cons));
-                                cons.AddCommand (new Kill (cons));
-                                cons.AddCommand (new ListItems (cons));
-                                cons.AddCommand (new ListKnownPlayers (cons));
-                                cons.AddCommand (new ListLandProtection (cons));
-                                cons.AddCommand (new ListPlayersExtended (cons));
-                                cons.AddCommand (new RemoveLandProtection (cons));
-                                cons.AddCommand (new RenderMap (cons));
-                                cons.AddCommand (new Reply (cons));
-                                cons.AddCommand (new SayToPlayer (cons));
-                                cons.AddCommand (new SetTimeReal (cons));
-                                cons.AddCommand (new ShowInventory (cons));
-                                cons.AddCommand (new TeleportPlayer (cons));
-                                cons.AddCommand (new AllocsFixes.CustomCommands.Version (cons));
+                                string ns = "AllocsFixes.CustomCommands";
+                                string basetype = "ConsoleCommand";
+
+                                foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes()) {
+                                        if (t.IsClass && t.Namespace.Equals (ns) && t.BaseType.Name.Equals (basetype)) {
+                                                try {
+                                                        ConstructorInfo ctor = t.GetConstructor (new Type[] {typeof(ConsoleSdtd)});
+                                                        cons.AddCommand ((ConsoleCommand)ctor.Invoke (new object[] {cons}));
+                                                } catch (Exception e) {
+                                                        Log.Out ("Could not register custom command \"" + t.Name + "\": " + e);
+                                                }
+                                        }
+                                }
                         } catch (Exception e) {
                                 Log.Out ("Error registering custom commands: " + e);

binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs

@@ -98 +98 @@
                         if (clientInfo != null) {
                                 Log.Out ("Player set to offline: " + steamId);
-                                Vector3i lastPos = new Vector3i (Entity.GetPosition ());
-                                lastPositionX = lastPos.x;
-                                lastPositionY = lastPos.y;
-                                lastPositionZ = lastPos.z;
-                                totalPlayTime += (long)(Time.timeSinceLevelLoad - Entity.CreationTimeSinceLevelLoad);
                                 lastOnline = DateTime.Now;
+                                try {
+                                        Vector3i lastPos = new Vector3i (Entity.GetPosition ());
+                                        lastPositionX = lastPos.x;
+                                        lastPositionY = lastPos.y;
+                                        lastPositionZ = lastPos.z;
+                                        totalPlayTime += (long)(Time.timeSinceLevelLoad - Entity.CreationTimeSinceLevelLoad);
+                                } catch (NullReferenceException) {
+                                        Log.Out ("Entity not available. Something seems to be wrong here...");
+                                }
                                 clientInfo = null;
                         }