From 13a6c8607776f119ac08f2e95d1d5f05cde63a19 Mon Sep 17 00:00:00 2001 From: espeon65536 Date: Sun, 20 Feb 2022 12:34:25 -0600 Subject: [PATCH] Minecraft: require bed for can_adventure if death link is on by default --- worlds/minecraft/Rules.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/worlds/minecraft/Rules.py b/worlds/minecraft/Rules.py index e3adfc9d..504f9d13 100644 --- a/worlds/minecraft/Rules.py +++ b/worlds/minecraft/Rules.py @@ -52,11 +52,13 @@ class MinecraftLogic(LogicMixin): return self.world.combat_difficulty[player].current_key def _mc_can_adventure(self, player: int): + death_link_check = not self.world.death_link[player] or self.has('Bed', player) if self._mc_combat_difficulty(player) == 'easy': - return self.has('Progressive Weapons', player, 2) and self._mc_has_iron_ingots(player) + return self.has('Progressive Weapons', player, 2) and self._mc_has_iron_ingots(player) and death_link_check elif self._mc_combat_difficulty(player) == 'hard': return True - return self.has('Progressive Weapons', player) and (self.has('Progressive Resource Crafting', player) or self.has('Campfire', player)) + return (self.has('Progressive Weapons', player) and death_link_check and + (self.has('Progressive Resource Crafting', player) or self.has('Campfire', player))) def _mc_basic_combat(self, player: int): if self._mc_combat_difficulty(player) == 'easy':