From c0e947f01620aa2ca9409a8e4c7b2dee5f62e52b Mon Sep 17 00:00:00 2001 From: Brady Date: Mon, 24 Dec 2018 12:23:57 -0600 Subject: [PATCH] Clean up canBreak --- .../bot/spec/BotPlayerController.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/baritone/bot/spec/BotPlayerController.java b/src/main/java/baritone/bot/spec/BotPlayerController.java index 0fc08cab6..5869520e8 100644 --- a/src/main/java/baritone/bot/spec/BotPlayerController.java +++ b/src/main/java/baritone/bot/spec/BotPlayerController.java @@ -214,26 +214,19 @@ public class BotPlayerController implements IPlayerController { } private boolean canBreak(EntityPlayer player, BlockPos pos) { + if (this.gameType.isCreative() || this.gameType == GameType.SPECTATOR) { + return false; + } + if (!player.world.getWorldBorder().contains(pos)) { return false; } - // Get OUTTA HERE - if (this.gameType.isCreative()) { - return false; + if (this.gameType.hasLimitedInteractions() && !player.isAllowEdit()) { + ItemStack stack = player.getHeldItemMainhand(); + return !stack.isEmpty() && stack.canDestroy(player.world.getBlockState(pos).getBlock()); } - if (this.gameType.hasLimitedInteractions()) { - if (this.gameType == GameType.SPECTATOR) { - return false; - } - - if (!player.isAllowEdit()) { - ItemStack stack = player.getHeldItemMainhand(); - - return !stack.isEmpty() && stack.canDestroy(player.world.getBlockState(pos).getBlock()); - } - } return true; }