Merge branch 'release/0.23.1'

README.md

@@ -8,6 +8,10 @@ a Team Fortress 2 client plugin that augments game spectating
 Changelog
 ---------
 
+**0.23.1**
+* player aliases
+  * fix infinite recursion
+
 **0.23.0**
 * general
   * major modularization - modules check dependencies and fail separately

src/common.h

@@ -122,5 +122,5 @@ inline std::string ConvertTreeToString(std::vector<std::string> tree) {
 	return string;
 }
 
-#define PLUGIN_VERSION "0.23.0"
+#define PLUGIN_VERSION "0.23.1"
 #define PRINT_TAG() ConColorMsg(Color(0, 153, 153, 255), "[StatusSpec] ")

src/modules/playeraliases.cpp

@@ -68,7 +68,21 @@ bool PlayerAliases::GetPlayerInfoOverride(int ent_num, player_info_t *pinfo) {
 		RETURN_META_VALUE(MRES_IGNORED, false);
 	}
 
-	CSteamID playerSteamID = player.GetSteamID();
+	static EUniverse universe = k_EUniverseInvalid;
+
+	if (universe == k_EUniverseInvalid) {
+		if (Interfaces::pSteamAPIContext->SteamUtils()) {
+			universe = Interfaces::pSteamAPIContext->SteamUtils()->GetConnectedUniverse();
+		}
+		else {
+			PRINT_TAG();
+			Warning("Steam libraries not available - assuming public universe for user Steam IDs!\n");
+
+			universe = k_EUniversePublic;
+		}
+	}
+
+	CSteamID playerSteamID = CSteamID(pinfo->friendsID, 1, universe, k_EAccountTypeIndividual);
 	TFTeam team = player.GetTeam();
 
 	std::string playerAlias = GetAlias(playerSteamID, pinfo->name);