mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-10 12:33:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Create into mc1.18/dev

Browse Source
This commit is contained in:
simibubi 2024-07-25 18:47:15 +02:00
commit f8cc7ab73c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/simibubi/create/content/contraptions/TranslatingContraption.java
View File

@ -21,7 +21,7 @@ public abstract class TranslatingContraption extends Contraption {
return Collections.emptySet();
if (cachedColliders == null || cachedColliderDirection != movementDirection) {
cachedColliderDirection = movementDirection;
cachedColliders= createColliders(world, movementDirection);
cachedColliders = createColliders(world, movementDirection);
}
return cachedColliders;
}

6
src/main/java/com/simibubi/create/content/trains/station/StationBlockEntity.java
View File

@ -288,7 +288,7 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab
BlockPos up = new BlockPos(track.getUpNormal(level, pos, state));
BlockPos down = new BlockPos(track.getUpNormal(level, pos, state).scale(-1));
int bogeyOffset = pos.distManhattan(edgePoint.getGlobalPosition()) - 1;
if (!isValidBogeyOffset(bogeyOffset)) {
for (boolean upsideDown : Iterate.falseAndTrue) {
for (int i = -1; i <= 1; i++) {
@ -364,6 +364,10 @@ public class StationBlockEntity extends SmartBlockEntity implements ITransformab
if (!tryEnterAssemblyMode())
return false;
//Check the station wasn't destroyed
if (!(level.getBlockState(worldPosition).getBlock() instanceof StationBlock))
return true;
BlockState newState = getBlockState().setValue(StationBlock.ASSEMBLING, true);
level.setBlock(getBlockPos(), newState, 3);
refreshBlockState();