Changeset 326 for binary-improvements/AllocsCommands

Timestamp:

Sep 4, 2018, 2:33:52 PM (6 years ago)

Author:

alloc

Message:

More cleanup, allocation improvements

Location:

binary-improvements/AllocsCommands

Files:

• Commands/Give.cs (modified) (1 diff)
• Commands/ListKnownPlayers.cs (modified) (3 diffs)
• Commands/ListLandProtection.cs (modified) (4 diffs)
• Commands/RemoveLandProtection.cs (modified) (1 diff)
• PrivateMessageConnections.cs (modified) (1 diff)

binary-improvements/AllocsCommands/Commands/Give.cs

@@ -47 +47 @@
                                 iv = new ItemValue (iv.type, true);
 
-                                int n = int.MinValue;
+                                int n;
                                 if (!int.TryParse (_params [2], out n) || n <= 0) {
                                         SdtdConsole.Instance.Output ("Amount is not an integer or not greater than zero.");

binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs

@@ -35 +35 @@
 
                                 if (_params.Count == 1) {
-                                        long steamid = -1;
-                                        if (_params [0].ToLower ().Equals ("-online")) {
+                                        long steamid;
+                                        if (_params [0].EqualsCaseInsensitive ("-online")) {
                                                 onlineOnly = true;
-                                        } else if (_params [0].ToLower ().Equals ("-notbanned")) {
+                                        } else if (_params [0].EqualsCaseInsensitive ("-notbanned")) {
                                                 notBannedOnly = true;
                                         } else if (_params [0].Length == 17 && long.TryParse (_params [0], out steamid)) {
                                                 isSteamId = true;
                                         } else {
-                                                nameFilter = _params [0].ToLower ();
+                                                nameFilter = _params [0];
                                         }
                                 }
@@ -53 +53 @@
                                                 SdtdConsole.Instance.Output (string.Format (
                                                         "{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}",
-                                                        0, p.Name, p.EntityID, nameFilter, p.IsOnline, p.IP,
+                                                        0, p.Name, p.EntityID, _params [0], p.IsOnline, p.IP,
                                                         p.TotalPlayTime / 60,
                                                         p.LastOnline.ToString ("yyyy-MM-dd HH:mm"))
                                                 );
                                         } else {
-                                                SdtdConsole.Instance.Output (string.Format ("SteamID {0} unknown!", nameFilter));
+                                                SdtdConsole.Instance.Output (string.Format ("SteamID {0} unknown!", _params [0]));
                                         }
                                 } else {
@@ -68 +68 @@
                                                         (!onlineOnly || p.IsOnline)
                                                         && (!notBannedOnly || !admTools.IsBanned (sid))
-                                                        && (nameFilter.Length == 0 || p.Name.ToLower ().Contains (nameFilter))
+                                                        && (nameFilter.Length == 0 || p.Name.ContainsCaseInsensitive (nameFilter))
                                                 ) {
                                                         SdtdConsole.Instance.Output (string.Format (

binary-improvements/AllocsCommands/Commands/ListLandProtection.cs

@@ -27 +27 @@
                         try {
                                 if (_senderInfo.RemoteClientInfo != null) {
-                                        if (_params.Count >= 1 && _params [0].ToLower ().Equals ("nearby")) {
+                                        if (_params.Count >= 1 && _params [0].EqualsCaseInsensitive ("nearby")) {
                                                 _params.Add (_senderInfo.RemoteClientInfo.playerId);
                                         }
@@ -50 +50 @@
                                         long tempLong;
 
-                                        if (_params [0].ToLower ().Equals ("summary")) {
+                                        if (_params [0].EqualsCaseInsensitive ("summary")) {
                                                 summaryOnly = true;
                                         } else if (_params [0].Length == 17 && long.TryParse (_params [0], out tempLong)) {
@@ -64 +64 @@
                                         }
                                 } else if (_params.Count >= 2) {
-                                        if (_params [0].ToLower ().Equals ("nearby")) {
+                                        if (_params [0].EqualsCaseInsensitive ("nearby")) {
                                                 try {
                                                         if (_params.Count == 3) {
@@ -123 +123 @@
                                 }
 
-                                if (steamIdFilter.Length == 0) {
+                                if (string.IsNullOrEmpty (steamIdFilter)) {
                                         SdtdConsole.Instance.Output ("Total of " + ppl.m_lpBlockMap.Count + " keystones in the game");
                                 }

binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs

@@ -59 +59 @@
                 private void removeByPosition (List<string> _coords) {
                         try {
-                                int x = int.MinValue;
+                                int x, y, z;
                                 int.TryParse (_coords [0], out x);
-                                int y = int.MinValue;
                                 int.TryParse (_coords [1], out y);
-                                int z = int.MinValue;
                                 int.TryParse (_coords [2], out z);
 

binary-improvements/AllocsCommands/PrivateMessageConnections.cs

@@ -11 +11 @@
 
                 public static ClientInfo GetLastPMSenderForPlayer (ClientInfo _player) {
-                        if (senderOfLastPM.ContainsKey (_player.steamId)) {
-                                CSteamID recSteamId = senderOfLastPM [_player.steamId];
-                                ClientInfo recInfo = ConnectionManager.Instance.Clients.ForSteamId (recSteamId);
-                                return recInfo;
+                        if (!senderOfLastPM.ContainsKey (_player.steamId)) {
+                                return null;
                         }
 
-                        return null;
+                        CSteamID recSteamId = senderOfLastPM [_player.steamId];
+                        ClientInfo recInfo = ConnectionManager.Instance.Clients.ForSteamId (recSteamId);
+                        return recInfo;
                 }
         }