From 60972e026b7bdbdc8aa48a9b10057aa902c94d89 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Wed, 30 Jun 2021 20:57:00 +0200 Subject: [PATCH] send packed NetworkItem in PrintJSON --- MultiServer.py | 3 ++- NetUtils.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/MultiServer.py b/MultiServer.py index 397daedf..c14283cc 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -569,7 +569,8 @@ def json_format_send_event(net_item: NetworkItem, receiving_player: int): NetUtils.add_json_text(parts, ")") return {"cmd": "PrintJSON", "data": parts, "type": "ItemSend", - "receiving": receiving_player, "sending": net_item.player} + "receiving": receiving_player, + "item": net_item} def get_intended_text(input_text: str, possible_answers: typing.Iterable[str] = all_console_names) -> typing.Tuple[ diff --git a/NetUtils.py b/NetUtils.py index ac425b3d..1438f9fe 100644 --- a/NetUtils.py +++ b/NetUtils.py @@ -308,7 +308,8 @@ class Hint(typing.NamedTuple): add_json_text(parts, ".") return {"cmd": "PrintJSON", "data": parts, "type": "Hint", - "receiving": self.receiving_player, "sending": self.finding_player} + "receiving": self.receiving_player, + "item": NetworkItem(self.item, self.location, self.finding_player)} @property def local(self):