From ffc000ec911d9e004902983303220afc7de0f2c3 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sat, 3 Dec 2022 04:22:58 +0100 Subject: [PATCH] Network: remove deprecated IgnoreGame tag --- CommonClient.py | 2 +- MultiServer.py | 3 +-- docs/network protocol.md | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CommonClient.py b/CommonClient.py index 92761542..aa11661d 100644 --- a/CommonClient.py +++ b/CommonClient.py @@ -799,7 +799,7 @@ if __name__ == '__main__': # Text Mode to use !hint and such with games that have no text entry class TextContext(CommonContext): - tags = {"AP", "IgnoreGame", "TextOnly"} + tags = {"AP", "TextOnly"} game = "" # empty matches any game since 0.3.2 items_handling = 0b111 # receive all items for /received want_slot_data = False # Can't use game specific slot_data diff --git a/MultiServer.py b/MultiServer.py index ad134901..072e5aa1 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -1541,8 +1541,7 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict): else: team, slot = ctx.connect_names[args['name']] game = ctx.games[slot] - ignore_game = "IgnoreGame" in args["tags"] or ( # IgnoreGame is deprecated. TODO: remove after 0.3.3? - ("TextOnly" in args["tags"] or "Tracker" in args["tags"]) and not args.get("game")) + ignore_game = ("TextOnly" in args["tags"] or "Tracker" in args["tags"]) and not args.get("game") if not ignore_game and args['game'] != game: errors.add('InvalidGame') minver = min_client_version if ignore_game else ctx.minimum_client_versions[slot] diff --git a/docs/network protocol.md b/docs/network protocol.md index c870d2f6..74e3fab1 100644 --- a/docs/network protocol.md +++ b/docs/network protocol.md @@ -644,7 +644,6 @@ Tags are represented as a list of strings, the common Client tags follow: | Name | Notes | |------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | AP | Signifies that this client is a reference client, its usefulness is mostly in debugging to compare client behaviours more easily. | -| IgnoreGame | Deprecated. See Tracker and TextOnly. Tells the server to ignore the "game" attribute in the [Connect](#Connect) packet. | | DeathLink | Client participates in the DeathLink mechanic, therefore will send and receive DeathLink bounce packets | | Tracker | Tells the server that this client will not send locations and is actually a Tracker. When specified and used with empty or null `game` in [Connect](#connect), game and game's version validation will be skipped. | | TextOnly | Tells the server that this client will not send locations and is intended for chat. When specified and used with empty or null `game` in [Connect](#connect), game and game's version validation will be skipped. |