Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed #459 ImmersiveEngineering multiblocks duplicating during jump

Browse source
This commit is contained in:
LemADEC 2020-06-24 02:05:58 +02:00
parent eb78756074
commit cc52c13fa2
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/cr0s/warpdrive/compat/CompatImmersiveEngineering.java
View file

@ -3,6 +3,8 @@ package cr0s.warpdrive.compat;
import blusunrize.immersiveengineering.api.energy.wires.IImmersiveConnectable;
import blusunrize.immersiveengineering.api.energy.wires.ImmersiveNetHandler;
import blusunrize.immersiveengineering.api.energy.wires.ImmersiveNetHandler.Connection;
import blusunrize.immersiveengineering.common.blocks.BlockIEMultiblock;
import blusunrize.immersiveengineering.common.blocks.TileEntityMultiblockPart;
import cr0s.warpdrive.Commons;
import cr0s.warpdrive.WarpDrive;
@ -75,7 +77,11 @@ public class CompatImmersiveEngineering implements IBlockTransformer {
@Override
public void removeExternals(final World world, final int x, final int y, final int z,
final Block block, final int blockMeta, final TileEntity tileEntity) {
// nothing to do
// since the mod forcefully drops original blocks, it's better to disassemble the whole structure prior to removal
if ( block instanceof BlockIEMultiblock
&& tileEntity instanceof TileEntityMultiblockPart ) {
((TileEntityMultiblockPart<?>) tileEntity).disassemble();
}
}
/*

13
src/main/java/cr0s/warpdrive/event/JumpSequencer.java
View file

@ -1251,12 +1251,6 @@ public class JumpSequencer extends AbstractSequencer {
}
}
}
// remove item drops and such
final WarpDriveText reason = new WarpDriveText();
if (!ship.removeEntities(reason)) {
WarpDrive.logger.error(reason.getUnformattedText());
}
}
LocalProfiler.stop();
@ -1321,6 +1315,13 @@ public class JumpSequencer extends AbstractSequencer {
actualIndexInShip++;
}
// remove item drops and such
final WarpDriveText reason = new WarpDriveText();
if (!ship.removeEntities(reason)) {
WarpDrive.logger.error(reason.getUnformattedText());
}
LocalProfiler.stop();
}