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

Improved jump flow for ComputerCraft

Browse source
This commit is contained in:
Unknown 2018-07-10 01:30:38 +02:00 • committed by unknown
parent d84ef2d609
commit 561d0b3d6e
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/cr0s/warpdrive/data/JumpBlock.java
View file

@ -334,16 +334,25 @@ public class JumpBlock {
isForgeMultipart = true;
newTileEntity = (TileEntity) CompatForgeMultipart.methodMultipartHelper_createTileFromNBT.invoke(null, targetWorld, nbtToDeploy);
} else if (block == WarpDriveConfig.CC_Computer || block == WarpDriveConfig.CC_peripheral
|| block == WarpDriveConfig.CCT_Turtle || block == WarpDriveConfig.CCT_Expanded || block == WarpDriveConfig.CCT_Advanced) {
newTileEntity = TileEntity.create(targetWorld, nbtToDeploy);
assert newTileEntity != null;
newTileEntity.invalidate();
}
if (newTileEntity == null) {
newTileEntity = TileEntity.create(targetWorld, nbtToDeploy);
if (newTileEntity == null) {
WarpDrive.logger.error(String.format("%s deploy failed to create new tile entity %s block %s:%d",
this, Commons.format(targetWorld, x, y, z), block, blockMeta));
WarpDrive.logger.error(String.format("NBT data was %s",
nbtToDeploy));
}
}
if ( newTileEntity != null
&& ( block == WarpDriveConfig.CC_Computer
|| block == WarpDriveConfig.CC_peripheral
|| block == WarpDriveConfig.CCT_Turtle
|| block == WarpDriveConfig.CCT_Expanded
|| block == WarpDriveConfig.CCT_Advanced ) ) {
newTileEntity.invalidate();
}
if (newTileEntity != null) {
@ -357,10 +366,6 @@ public class JumpBlock {
}
newTileEntity.markDirty();
} else {
WarpDrive.logger.error(String.format(" deploy failed to create new tile entity %s block %s:%d",
Commons.format(targetWorld, x, y, z), block, blockMeta));
WarpDrive.logger.error(String.format("NBT data was %s", nbtToDeploy));
}
}
return target;