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 pull request #6088 from cakeGit/patch-2

Browse Source 
Added station blockstate check
This commit is contained in:
simibubi 2024-07-25 18:36:00 +02:00 committed by GitHub
commit 5fc2153d52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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