Skip to content

Commit

Permalink
Merge branch 'tracker' into tracker_optimize_gen
Browse files Browse the repository at this point in the history
  • Loading branch information
qwint authored Aug 17, 2024
2 parents 59ac364 + 1f25da5 commit 9971927
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions worlds/tracker/TrackerClient.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class TrackerView(RecycleView):
def __init__(self, **kwargs):
super().__init__(**kwargs)
self.data = []
self.data.append({"text": "Tracker BETA v0.1.10 Initializing"})
self.data.append({"text": "Tracker v0.1.10 Initializing"})

def resetData(self):
self.data.clear()
Expand Down Expand Up @@ -415,7 +415,6 @@ def on_package(self, cmd: str, args: dict):
raise "TODO: add error - something went very wrong with interpret_slot_data"
else:
raise "TODO: add error - something went very wrong with matching world to slot"

else:
# TODO consider allowing worlds that self-attest to not need an options file for UT
self.log_to_tab("Player's Yaml not in tracker's list", False)
Expand All @@ -439,6 +438,7 @@ async def disconnect(self, allow_autoreconnect: bool = False):
self.ui.tabs.show_map = False
self.tracker_world = None
self.multiworld = None

await super().disconnect(allow_autoreconnect)

def _set_host_settings(self, host):
Expand Down Expand Up @@ -791,6 +791,5 @@ def launch():

asyncio.run(main(args))


if __name__ == "__main__":
launch()

0 comments on commit 9971927

Please sign in to comment.