tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix zero-length mechanical multiblocks being allowed to form, as well as some crashes when one is formed/broken, closes #34

Browse source
This commit is contained in:
malte0811 2018-07-17 21:03:14 +02:00
parent 0a67837965
commit f94d73717f
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/malte0811/industrialWires/blocks/converter/TileEntityMechMB.java
View file

@ -97,7 +97,7 @@ public class TileEntityMechMB extends TileEntityIWMultiblock implements ITickabl
Compat.loadIC2Tile.accept(this);
firstTick = false;
}
if (isLogicDummy() || mechanical == null) {
if (isLogicDummy() || mechanical == null || mechanical.length==0) {
return;
}
if (world.isRemote) {
@ -108,8 +108,7 @@ public class TileEntityMechMB extends TileEntityIWMultiblock implements ITickabl
}
if (energyState.clientUpdate()||firstTick) {
IndustrialWires.proxy.updateMechMBTurningSound(this, energyState);
int otherEndOffset = offsets[offsets.length-1]+mechanical[mechanical.length-1].getLength();
TileEntity otherEnd = Utils.getExistingTileEntity(world, pos.offset(facing, -otherEndOffset));
TileEntity otherEnd = Utils.getExistingTileEntity(world, pos.offset(facing, -offsets[mechanical.length]));
if (otherEnd instanceof TileEntityMechMB) {
IndustrialWires.proxy.updateMechMBTurningSound((TileEntityMechMB) otherEnd, energyState);
}
@ -332,7 +331,7 @@ public class TileEntityMechMB extends TileEntityIWMultiblock implements ITickabl
public void setMechanical(MechMBPart[] mech, double speed) {
mechanical = mech;
offsets = new int[mechanical.length];
offsets = new int[mechanical.length+1];
double weight = 0;
int offset = 1;
List<int[]> electrical = new ArrayList<>();
@ -348,6 +347,7 @@ public class TileEntityMechMB extends TileEntityIWMultiblock implements ITickabl
lastEStart = -1;
}
}
offsets[mechanical.length] = offset;
if (lastEStart >= 0) {
electrical.add(new int[]{lastEStart, mechanical.length});
}
@ -514,7 +514,7 @@ public class TileEntityMechMB extends TileEntityIWMultiblock implements ITickabl
}
}
BlockPos otherEnd = offset(pos, facing.getOpposite(), mirrored, 0,
offsets[offsets.length - 1] + mechanical[mechanical.length - 1].getLength(), 0);
offsets[mechanical.length], 0);
world.setBlockState(otherEnd,
blockMetalDecoration0.getDefaultState().withProperty(blockMetalDecoration0.property, HEAVY_ENGINEERING));
world.setBlockState(otherEnd.down(),

3
src/main/java/malte0811/industrialWires/mech_mb/MultiblockMechMB.java
View file

@ -117,6 +117,9 @@ public class MultiblockMechMB implements MultiblockHandler.IMultiblock {
return false;
}
}
if (parts.isEmpty()) {
return false;
}
double finalWeight = weight;
w.setOrigin(pos);
formEnd(w, mutPos, END, (te, master) -> {