Merge branch 'mc1.15/dev' into mc1.16/dev
This commit is contained in:
commit
9dc528d96c
2 changed files with 7 additions and 6 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue