Another crash I missed oof...

BiscuitDevelopment · Sep 17, 2019 · 40e5cee · 40e5cee
1 parent 40dff85
commit 40e5cee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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);
             }
         }