Fix some merge issues

This commit is contained in:
Jesse Boyd
2018-08-14 00:38:33 +10:00
parent 025360753f
commit 0632a9ce96
5 changed files with 27 additions and 11 deletions

View File

@ -104,7 +104,7 @@ public abstract class AbstractPlayerActor implements Actor, Player, Cloneable {
byte free = 0;
while (y <= world.getMinimumPoint().getBlockY() + 2) {
while (y <= world.getMaximumPoint().getBlockY() + 2) {
if (!world.getBlock(new Vector(x, y, z)).getBlockType().getMaterial().isMovementBlocker()) {
++free;
} else {