tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix contraption stopping action is not called in some cases (#526)

Browse source
This commit is contained in:
Snownee 2020-12-09 07:47:40 +08:00
parent 3301f8ff01
commit 88ba7f2887
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java
View file

@ -435,6 +435,15 @@ public abstract class AbstractContraptionEntity extends Entity implements IEntit
} }
} }
@SuppressWarnings("deprecation")
@Override
public void remove(boolean keepData) {
if (!world.isRemote && !removed && contraption != null) {
contraption.stop(world);
}
super.remove(keepData);
}
protected abstract StructureTransform makeStructureTransform(); protected abstract StructureTransform makeStructureTransform();
@Override @Override

1
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
View file

@ -743,7 +743,6 @@ public abstract class Contraption {
} }
public void addBlocksToWorld(World world, StructureTransform transform) { public void addBlocksToWorld(World world, StructureTransform transform) {
stop(world);
for (boolean nonBrittles : Iterate.trueAndFalse) { for (boolean nonBrittles : Iterate.trueAndFalse) {
for (BlockInfo block : blocks.values()) { for (BlockInfo block : blocks.values()) {
if (nonBrittles == BlockMovementTraits.isBrittle(block.state)) if (nonBrittles == BlockMovementTraits.isBrittle(block.state))