From c61f3b9110a12cc13d4cde77149740d026b2d1ee Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Fri, 8 Apr 2022 21:15:39 +0200 Subject: [PATCH] MC: make slot data json compatible (Changing base type of Options in recent PR broke this) --- worlds/minecraft/__init__.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/worlds/minecraft/__init__.py b/worlds/minecraft/__init__.py index 38ee6275..6c7594f1 100644 --- a/worlds/minecraft/__init__.py +++ b/worlds/minecraft/__init__.py @@ -42,12 +42,13 @@ class MinecraftWorld(World): 'client_version': client_version, 'minecraft_version': minecraft_version, 'structures': {exit: self.world.get_entrance(exit, self.player).connected_region.name for exit in exits}, - 'advancement_goal': self.world.advancement_goal[self.player], - 'egg_shards_required': min(self.world.egg_shards_required[self.player], self.world.egg_shards_available[self.player]), - 'egg_shards_available': self.world.egg_shards_available[self.player], + 'advancement_goal': self.world.advancement_goal[self.player].value, + 'egg_shards_required': min(self.world.egg_shards_required[self.player].value, + self.world.egg_shards_available[self.player].value), + 'egg_shards_available': self.world.egg_shards_available[self.player].value, 'required_bosses': self.world.required_bosses[self.player].current_key, - 'MC35': bool(self.world.send_defeated_mobs[self.player]), - 'death_link': bool(self.world.death_link[self.player]), + 'MC35': bool(self.world.send_defeated_mobs[self.player].value), + 'death_link': bool(self.world.death_link[self.player].value), 'starting_items': str(self.world.starting_items[self.player].value), 'race': self.world.is_race, }