Merge branch 'mc1.15/dev' into mc1.16/dev

This commit is contained in:
simibubi 2021-04-04 01:30:18 +02:00
commit 9dc528d96c
2 changed files with 7 additions and 6 deletions

View file

@ -63,12 +63,12 @@ public class NixieTubeBlock extends HorizontalBlock implements ITE<NixieTubeTile
return ActionResultType.SUCCESS;
BlockPos currentPos = pos;
// while (true) {
// BlockPos nextPos = currentPos.offset(left);
// if (world.getBlockState(nextPos) != state)
// break;
// currentPos = nextPos;
// }
while (true) {
BlockPos nextPos = currentPos.offset(left);
if (world.getBlockState(nextPos) != state)
break;
currentPos = nextPos;
}
int index = 0;

View file

@ -58,6 +58,7 @@ public abstract class NavigatableSimiScreen extends AbstractSimiScreen {
@Override
protected void init() {
super.init();
backTrack = null;
List<Screen> screenHistory = ScreenOpener.getScreenHistory();
if (screenHistory.isEmpty())
return;