mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-28 16:06:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java
View file

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

1
src/main/java/com/simibubi/create/foundation/ponder/NavigatableSimiScreen.java
View file

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