Changeset 123

Timestamp:

Aug 18, 2014, 9:26:24 PM (10 years ago)

Author:

alloc

Message:

Fixes: Fixed #36, #37, #38

Location:

binary-improvements

Files:

• 7dtd-server-fixes/src/TelnetCommands/RemoveLandProtection.cs (modified) (2 diffs)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• server-fixes.userprefs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/src/TelnetCommands/RemoveLandProtection.cs

@@ -18 +18 @@
         }
 
-        public override void Run (string[] _params)
+        private void removeById (string _id)
         {
                 try {
-                        if (_params.Length != 3) {
-                                m_Console.SendResult ("Usage: removelandprotection <x> <y> <z>");
+                        PersistentPlayerList ppl = CommonMappingFunctions.GetGameManager ().GetPersistentPlayerList ();
+
+                        if (_id.Length < 1 || !ppl.Players.ContainsKey(_id)) {
+                                m_Console.SendResult ("Not a valid Steam ID or user has never logged on. Use \"listlandprotection\" to get a list of keystones.");
+                                return;
+                        }
+                        if (ppl.Players[_id].LPBlocks == null || ppl.Players[_id].LPBlocks.Count == 0) {
+                                m_Console.SendResult ("Player does not own any keystones. Use \"listlandprotection\" to get a list of keystones.");
                                 return;
                         }
 
+                        List<BlockChangeInfo> changes = new List<BlockChangeInfo> ();
+                        foreach (Vector3i pos in ppl.Players[_id].LPBlocks) {
+                                BlockChangeInfo bci = new BlockChangeInfo (pos, 0, true);
+                                changes.Add (bci);
+                        }
+                        CommonMappingFunctions.GetGameManager ().SetBlocksRPC (changes);
+
+                        m_Console.SendResult ("#"+changes.Count + " Land protection blocks for player \"" + _id + "\" removed");
+                } catch (Exception e) {
+                        Log.Out ("Error in RemoveLandProtection.removeById: " + e);
+                }
+        }
+
+        private void removeByPosition (string[] _coords)
+        {
+                try {
                         int x = int.MinValue;
-                        int.TryParse (_params [0], out x);
+                        int.TryParse (_coords [0], out x);
                         int y = int.MinValue;
-                        int.TryParse (_params [1], out y);
+                        int.TryParse (_coords [1], out y);
                         int z = int.MinValue;
-                        int.TryParse (_params [2], out z);
+                        int.TryParse (_coords [2], out z);
 
                         if (x == int.MinValue || y == int.MinValue || z == int.MinValue) {
@@ -48 +70 @@
                         }
 
-                        ppl.RemoveLandProtectionBlock (v);
-                        ppl.Write (StaticDirectories.GetSaveGameDir () + "/players.xml");
-                        m_Console.SendResult ("Land protection block association at (" + v.ToString () + ") removed");
+                        BlockChangeInfo bci = new BlockChangeInfo (v, 0, true);
+
+                        List<BlockChangeInfo> changes = new List<BlockChangeInfo> ();
+                        changes.Add (bci);
+
+                        CommonMappingFunctions.GetGameManager ().SetBlocksRPC (changes);
+
+                        m_Console.SendResult ("Land protection block at (" + v.ToString () + ") removed");
+                } catch (Exception e) {
+                        Log.Out ("Error in RemoveLandProtection.removeByPosition: " + e);
+                }
+        }
+
+        public override void Run (string[] _params)
+        {
+                try {
+                        if (_params.Length == 1) {
+                                removeById (_params [0]);
+                        } else if (_params.Length == 3) {
+                                removeByPosition (_params);
+                        } else {
+                                m_Console.SendResult ("Usage: removelandprotection <x> <y> <z>  OR  removelandprotection <steamid>");
+                        }
                 } catch (Exception e) {
                         Log.Out ("Error in RemoveLandProtection.Run: " + e);

binary-improvements/server-fixes.userprefs

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="7dtd-server-fixes/src/AdminToolsStuff.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="7dtd-server-fixes/src/TelnetCommands/RemoveLandProtection.cs">
     <Files>
       <File FileName="assembly-patcher/Main.cs" Line="10" Column="3" />
       <File FileName="7dtd-server-fixes/src/AssemblyInfo.cs" Line="20" Column="34" />
-      <File FileName="7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs" Line="44" Column="25" />
-      <File FileName="7dtd-server-fixes/src/TelnetCommands/Kill.cs" Line="36" Column="70" />
+      <File FileName="7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs" Line="45" Column="17" />
       <File FileName="7dtd-server-fixes/src/AllocsNetTelnetServer.cs" Line="1" Column="1" />
-      <File FileName="7dtd-server-fixes/src/AdminToolsStuff.cs" Line="43" Column="1" />
+      <File FileName="7dtd-server-fixes/src/TelnetCommands/RemoveLandProtection.cs" Line="52" Column="44" />
     </Files>
   </MonoDevelop.Ide.Workbench>