Code cleanup

InsultingPros · Sep 23, 2022 · 7e5d7e9 · 7e5d7e9
1 parent e64d460
commit 7e5d7e9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 26 deletions.
diff --git a/Classes/CSDMasterServerUplink.uc b/Classes/CSDMasterServerUplink.uc
@@ -82,10 +82,6 @@ var private array<GameInfo.KeyValuePair> cachedServerInfo;
 // ==========================================================================
 event postBeginPlay()
 {
-    // ConsoleCommand("PROFILESCRIPT START");
-    // start the timer with config delay
-    setTimer(refreshTime, true);
-
     // add to the game special custom GameRules
     // so these GameRules will add extra details on the server description
     if (AdditionalSD == none)
@@ -102,6 +98,31 @@ event postBeginPlay()
         if (inStr(playerAliveNicknamePattern, "%nickname%") == -1)
             log("CustomServerDetails[WARNING]: You set 'bAnotherNicknamesStyle=true'. But you didn't paste %nickname% in 'playerAliveNicknamePattern'. JUST DO IT!");
     }
+
+    // ConsoleCommand("PROFILESCRIPT START");
+    // start the timer with config delay
+    setTimer(refreshTime, true);
+}
+
+
+final private function CacheStuff()
+{
+    // filter/add/change server details
+    if (bChangeServerDetails)
+    {
+        filterServerDetails();
+    }
+
+    if (bMapColor)
+    {
+        cachedColoredMapName = class'o_Utility'.static.ParseTags(mapColor $ srl.mapName);
+        srl.mapName = cachedColoredMapName;
+    }
+
+    cachedServerInfo = srl.ServerInfo;
+    serverState = srl;
+
+    bInit = true;
 }
 
 
@@ -125,36 +146,21 @@ event timer()
     getServerPlayers();
     level.game.getServerDetails(srl);
 
-    // change server name to custom one
-    if (bCustomServerName)
-        dynamicChangeServerName();
-
     if (!bInit)
-    {
-        // filter/add/change server details
-        if (bChangeServerDetails)
-        {
-            filterServerDetails();
-        }
-
-        if (bMapColor)
-        {
-            cachedColoredMapName = class'o_Utility'.static.ParseTags(mapColor $ srl.mapName);
-            srl.mapName = cachedColoredMapName;
-        }
-
-        cachedServerInfo = srl.ServerInfo;
-        serverState = srl;
-        bInit = true;
-    }
+        CacheStuff();
     else
     {
+        // change server name to custom one
+        if (bCustomServerName)
+            dynamicChangeServerName();
+
         if (bMapColor)
             srl.mapName = cachedColoredMapName;
 
         srl.ServerInfo = cachedServerInfo;
         serverState = srl;
     }
+
     // uncomment if you want to measure whole mod impact in performance
     // UnClock(f);
     // log("Timer() job done in - "@f);

diff --git a/Classes/o_Utility.uc b/Classes/o_Utility.uc
@@ -32,7 +32,7 @@ final static function Init()
             default.cachedColoredStrings[i] = class'GameInfo'.static.MakeColorCode(default.ColorList[i].Color);
         }
         default.bInit = true;
-        log(">>>>>>>>>> All tags and colored strings cached!");
+        // log(">>>>>>>>>> All tags and colored strings cached!");
     }
 }