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

Refactoring: use targetWorld

Browse source
This commit is contained in:
Disasm 2013-07-12 15:07:42 +04:00
parent b50678fb08
commit 1651ce0caf
1 changed files with 12 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -774,24 +774,15 @@ public class EntityJump extends Entity {
World spaceWorld = DimensionManager.getWorld(WarpDrive.instance.spaceDimID);
World surfaceWorld = DimensionManager.getWorld(0);
int newY, newX, newZ;
newX = oldX + moveX;
newY = oldY + moveY;
newZ = oldZ + moveZ;
int newX = oldX + moveX;
int newY = oldY + moveY;
int newZ = oldZ + moveZ;
int blockID = shipBlock.blockID;
int blockMeta = shipBlock.blockMeta;
if (!toSpace && !fromSpace)
{
mySetBlock(worldObj, newX, newY, newZ, blockID, blockMeta, 2);
} else if (toSpace)
{
mySetBlock(spaceWorld, newX, newY, newZ, blockID, blockMeta, 2);
} else if (fromSpace) {
mySetBlock(surfaceWorld, newX, newY, newZ, blockID, blockMeta, 2);
}
mySetBlock(targetWorld, newX, newY, newZ, blockID, blockMeta, 2);
NBTTagCompound oldnbt = new NBTTagCompound();
@ -821,14 +812,7 @@ public class EntityJump extends Entity {
newTileEntity = TileEntity.createAndLoadEntity(oldnbt);
newTileEntity.invalidate();
} else {
if (!toSpace && !fromSpace) {
newTileEntity = worldObj.getBlockTileEntity(newX, newY, newZ);
} else if (toSpace) {
newTileEntity = spaceWorld.getBlockTileEntity(newX, newY, newZ);
} else if (fromSpace) {
newTileEntity = surfaceWorld.getBlockTileEntity(newX, newY, newZ);
}
newTileEntity = targetWorld.getBlockTileEntity(newX, newY, newZ);
if (newTileEntity == null) {
System.out.println("[EJ] Error moving tileEntity! TE is null");
return false;
@ -837,32 +821,15 @@ public class EntityJump extends Entity {
newTileEntity.invalidate();
newTileEntity.readFromNBT(oldnbt);
if (!toSpace && !fromSpace)
{
worldObj.setBlockTileEntity(newX, newY, newZ, newTileEntity);
} else if (toSpace)
{
//newTileEntity.worldObj = spaceWorld;
spaceWorld.setBlockTileEntity(newX, newY, newZ, newTileEntity);
} else if (fromSpace) {
//newTileEntity.worldObj = surfaceWorld;
surfaceWorld.setBlockTileEntity(newX, newY, newZ, newTileEntity);
}
//newTileEntity.worldObj = targetWorld;
targetWorld.setBlockTileEntity(newX, newY, newZ, newTileEntity);
}
newTileEntity.worldObj = targetWorld;
newTileEntity.validate();
if (!toSpace && !fromSpace)
{
worldObj.setBlockTileEntity(newX, newY, newZ, newTileEntity);
} else if (toSpace)
{
spaceWorld.setBlockTileEntity(newX, newY, newZ, newTileEntity);
} else if (fromSpace) {
surfaceWorld.setBlockTileEntity(newX, newY, newZ, newTileEntity);
}
targetWorld.setBlockTileEntity(newX, newY, newZ, newTileEntity);
worldObj.removeBlockTileEntity(oldX, oldY, oldZ);
}
} catch (Exception exception) {