Merge branch 'master' into travis-test
This commit is contained in:
commit
b056f18444
@ -65,9 +65,6 @@ public class MovementPillar extends Movement {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!context.hasThrowaway() && !ladder) {
|
||||
return COST_INF;
|
||||
}
|
||||
if (fromDown instanceof BlockVine) {
|
||||
if (!hasAgainst(x, y, z)) {
|
||||
return COST_INF;
|
||||
@ -85,6 +82,9 @@ public class MovementPillar extends Movement {
|
||||
return LADDER_UP_ONE_COST;
|
||||
}
|
||||
}
|
||||
if (!context.hasThrowaway() && !ladder) {
|
||||
return COST_INF;
|
||||
}
|
||||
double hardness = MovementHelper.getMiningDurationTicks(context, x, y + 2, z, toBreak, true);
|
||||
if (hardness >= COST_INF) {
|
||||
return COST_INF;
|
||||
|
Loading…
Reference in New Issue
Block a user