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

Fixed regression that broke IC2 reactors and some machines

Browse source 
IC2 reactors was fixed in 86e96a43ee but fix is regressed by last pull-requests.
This commit is contained in:
Cr0s 2014-08-27 16:53:59 +04:00
parent 597d216e33
commit 97df0feb29
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/cr0s/WarpDrive/EntityJump.java
View file

@ -989,8 +989,6 @@ public class EntityJump extends Entity
newTileEntity = TileEntity.createAndLoadEntity(oldnbt);
newTileEntity.invalidate();
}
else if (blockID == WarpDriveConfig.i.GT_Machine)
newTileEntity = TileEntity.createAndLoadEntity(oldnbt);
else if (blockID == WarpDriveConfig.i.AS_Turbine)
{
if (oldnbt.hasKey("zhuYao"))
@ -1001,21 +999,17 @@ public class EntityJump extends Entity
nbt1.setDouble("z", newZ);
oldnbt.setTag("zhuYao", nbt1);
}
newTileEntity = TileEntity.createAndLoadEntity(oldnbt);
}
else
{
newTileEntity = targetWorld.getBlockTileEntity(newX, newY, newZ);
if (newTileEntity == null)
{
System.out.println("[EJ] Error moving tileEntity! TE is null");
return false;
}
newTileEntity.invalidate();
newTileEntity.readFromNBT(oldnbt);
if (newTileEntity == null) {
newTileEntity = TileEntity.createAndLoadEntity(oldnbt);
}
newTileEntity.worldObj = targetWorld;
newTileEntity.validate();
worldObj.removeBlockTileEntity(oldX, oldY, oldZ);
targetWorld.setBlockTileEntity(newX, newY, newZ, newTileEntity);
}
@ -1220,4 +1214,4 @@ public class EntityJump extends Entity
e.printStackTrace();
}
}
}
}