From 40e5ceef070654dc87637839dc8e6d7dc2109bd9 Mon Sep 17 00:00:00 2001 From: Biscuit Date: Mon, 16 Sep 2019 23:45:16 -0400 Subject: [PATCH] Another crash I missed oof... --- .../skyblockaddons/mixins/MixinPlayerControllerMP.java | 6 ++++-- .../biscuit/skyblockaddons/mixins/MixinRenderManager.java | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/codes/biscuit/skyblockaddons/mixins/MixinPlayerControllerMP.java b/src/main/java/codes/biscuit/skyblockaddons/mixins/MixinPlayerControllerMP.java index 664a4ad8e1..f4e6ee3aad 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/mixins/MixinPlayerControllerMP.java +++ b/src/main/java/codes/biscuit/skyblockaddons/mixins/MixinPlayerControllerMP.java @@ -50,8 +50,10 @@ private void onPlayerDamageBlock(BlockPos loc, EnumFacing face, CallbackInfoRetu return; } } - if (main.getUtils().getLocation().equals(EnumUtils.Location.ISLAND) && main.getConfigValues().isEnabled(Feature.AVOID_BREAKING_BOTTOM_SUGAR_CANE) && (block.equals(Blocks.reeds) && mc.theWorld.getBlockState(loc.down()).getBlock() != Blocks.reeds)) { - if (heldItem == null || heldItem.getItem().equals(Items.reeds) || heldItem.getItem().equals(Items.diamond_hoe) || heldItem.getItem().equals(Items.iron_hoe) || heldItem.getItem().equals(Items.golden_hoe) || heldItem.getItem().equals(Items.stone_hoe) + if (main.getUtils().getLocation() == EnumUtils.Location.ISLAND && main.getConfigValues().isEnabled(Feature.AVOID_BREAKING_BOTTOM_SUGAR_CANE) + && (block.equals(Blocks.reeds) && mc.theWorld.getBlockState(loc.down()).getBlock() != Blocks.reeds)) { + if (heldItem == null || heldItem.getItem().equals(Items.reeds) || heldItem.getItem().equals(Items.diamond_hoe) + || heldItem.getItem().equals(Items.iron_hoe) || heldItem.getItem().equals(Items.golden_hoe) || heldItem.getItem().equals(Items.stone_hoe) || heldItem.getItem().equals(Items.wooden_hoe) || heldItem.getItem().equals(Items.wooden_hoe)) { if (System.currentTimeMillis() - lastStemMessage > 20000) { lastStemMessage = System.currentTimeMillis(); diff --git a/src/main/java/codes/biscuit/skyblockaddons/mixins/MixinRenderManager.java b/src/main/java/codes/biscuit/skyblockaddons/mixins/MixinRenderManager.java index caeded7738..4727dcd52d 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/mixins/MixinRenderManager.java +++ b/src/main/java/codes/biscuit/skyblockaddons/mixins/MixinRenderManager.java @@ -37,8 +37,7 @@ private void shouldRenderRedirect(Entity entityIn, ICamera camera, double camX, } if (main.getConfigValues().isEnabled(Feature.HIDE_PLAYERS_IN_LOBBY) && (entityIn instanceof EntityOtherPlayerMP || entityIn instanceof EntityFX || entityIn instanceof EntityItemFrame) && - entityIn.getDistanceToEntity(Minecraft.getMinecraft().thePlayer) > 7 && main.getUtils().getLocation() != null && - main.getUtils().getLocation().equals(EnumUtils.Location.VILLAGE)) { + entityIn.getDistanceToEntity(Minecraft.getMinecraft().thePlayer) > 7 && main.getUtils().getLocation() == EnumUtils.Location.VILLAGE) { cir.setReturnValue(false); } }