ChestFarmer: Updates

seppukudevelopment · Nov 20, 2021 · eb7dd5c · eb7dd5c
1 parent 2819bcc
commit eb7dd5c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/combat/ChestFarmerModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/combat/ChestFarmerModule.java
@@ -105,8 +105,7 @@ public void onWalkingUpdate(EventUpdateWalkingPlayer event) {
             final BlockPos east = interpolatedPos.east();
             final BlockPos west = interpolatedPos.west();
 
-            final BlockPos[] possibleBlocks = new BlockPos[]{north.down(), south.down(), east.down(), west.down(),
-                    north, south, east, west};
+            final BlockPos[] possibleBlocks = new BlockPos[]{north, south, east, west};
 
             if (this.mineRotationTask.isOnline()) {
                 if (mc.world.loadedTileEntityList.stream().noneMatch(tileEntity -> tileEntity instanceof TileEntityEnderChest)) {
@@ -219,8 +218,11 @@ private boolean canBreak(BlockPos pos) {
     }
 
     private boolean valid(BlockPos pos) {
+        if (mc.player == null)
+            return false;
+
         // there are no entities colliding with block placement
-        if (!mc.world.checkNoEntityCollision(new AxisAlignedBB(pos)))
+        if (!mc.world.checkNoEntityCollision(new AxisAlignedBB(pos), mc.player))
             return false;
 
         // player is too far from distance