Resolve merge conflicts

2018-11-13 15:29:02 -06:00
parent d3db551cc9 72058c792a
commit 17161fd576
9 changed files with 18 additions and 22 deletions
@@ -57,8 +57,6 @@ public abstract class Movement implements IMovement, Helper, MovementHelper {
     */
    protected final BetterBlockPos positionToPlace;

-    private boolean didBreakLastTick;
-
    private Double cost;

    public List<BlockPos> toBreakCached = null;