From 3872920093a1549d2f729f38e88b4a64e42ef714 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Tue, 5 May 2020 22:12:18 -0700 Subject: [PATCH] Disabled bogus warning about remote character list --- .efrocachemap | 16 ++++++++-------- assets/src/ba_data/python/ba/_lobby.py | 15 +++++++-------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index f084286a..3780919e 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4132,16 +4132,16 @@ "assets/build/windows/x64/python.exe": "https://files.ballistica.net/cache/ba1/25/a7/dc87c1be41605eb6fefd0145144c", "assets/build/windows/x64/python37.dll": "https://files.ballistica.net/cache/ba1/b9/e4/d912f56e42e9991bcbb4c804cfcb", "assets/build/windows/x64/pythonw.exe": "https://files.ballistica.net/cache/ba1/6c/bb/b6f52c306aa4e88061510e96cefe", - "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/69/4c/039dc398ab53d82c2cb22e98c0d8", + "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/8c/a0/002b38837d6d538912c7e3353d38", "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c8/af/0f496b474262aea9ee0f91145177", - "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/98/f9/f1f09b634610cc771ac346b16840", + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/23/ff/2b90933ab022e851c9ee1885bd02", "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/2f/ee/38fac529e6e1fc418334e3c5a96f", - "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/28/55/ea881bf6fb479751bc9caaf5e8af", + "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/8d/99/1048ca7d9a3f8aabc7719399e996", "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/81/b5/72bb876e9a7e88cbd2c828b7b1a9", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/35/5f/61e8b74618a1fe1af75ecbbb72dc", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/3d/8b/ff95157b4e62b80210841a81594b", "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/80/b7/ac34c7c602b40a1f4f095b2bd5df", - "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/38/c6/a526b7950d0327337199d7945025", - "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/9c/80/9c83c52e7f86cede3aa7cdc1d057", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/ac/f2/95c05a0fbd4782925a6d3b830584", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/f2/82/d7d57d96f9e8e3dab865bef1b5c3" + "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/c4/3b/8de9d3aa9d2bcfb7ad731b2243bc", + "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/b9/e3/5f34b93ba4b62facbfea0a8dfde4", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/a7/3e/65b9f907e53f753aa4178500cb2f", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/58/1f/3241179955da91425342cea435a0" } \ No newline at end of file diff --git a/assets/src/ba_data/python/ba/_lobby.py b/assets/src/ba_data/python/ba/_lobby.py index ac1702a2..e755849f 100644 --- a/assets/src/ba_data/python/ba/_lobby.py +++ b/assets/src/ba_data/python/ba/_lobby.py @@ -365,17 +365,16 @@ class Chooser: self._profilename = self._profilenames[self._profileindex] character = self.profiles[self._profilename]['character'] - # Hmmm; at the moment we're not properly pulling the list + # At the moment we're not properly pulling the list # of available characters from clients, so profiles might use a - # character not in their list. for now, just go ahead and add - # the character name to their list as long as we're aware of it - # UPDATE: actually we now should be getting their character list, - # so this should no longer be happening; adding warning print - # for now and can delete later. + # character not in their list. For now, just go ahead and add + # a character name to their list as long as we're aware of it. + # This just means they won't always be able to override their + # character to others they own, but profile characters should work + # (and we validate profiles on the master server so no exploit + # opportunities) if (character not in self.character_names and character in _ba.app.spaz_appearances): - print('got remote character not in their character list:', - character, self.character_names) self.character_names.append(character) self.character_index = self.character_names.index(character) self._color, self._highlight = (_profile.get_player_profile_colors(