diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-09-28 14:05:10 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-10-02 13:13:07 +0200 |
| commit | c09ebb9e9b20755fcdef5782146fbde1cb4fc4ff (patch) | |
| tree | 312ca7a7d297676149625b295a150424d33694ab /src/main/java/gregtech/common/tileentities/machines/basic | |
| parent | cc89c94527a99453bd87f3328c6a753d96a6206a (diff) | |
| download | GT5-Unofficial-c09ebb9e9b20755fcdef5782146fbde1cb4fc4ff.tar.gz GT5-Unofficial-c09ebb9e9b20755fcdef5782146fbde1cb4fc4ff.tar.bz2 GT5-Unofficial-c09ebb9e9b20755fcdef5782146fbde1cb4fc4ff.zip | |
Teleport2 and readd null checks on tools
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/basic')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java index e923302607..fe9d6d78ab 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java @@ -293,16 +293,11 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank { tEntity.riddenByEntity.mountEntity(null); } if ((this.mTargetD == getBaseMetaTileEntity().getWorld().provider.dimensionId) || (!isDimensionalTeleportAvailable()) || (!GT_Utility.moveEntityToDimensionAtCoords(tEntity, this.mTargetD, this.mTargetX + 0.5D, this.mTargetY + 0.5D, this.mTargetZ + 0.5D))) { -// System.out.println("tele"); -//// System.out.println("tdim: "+mTargetD+" proDim: "+getBaseMetaTileEntity().getWorld().provider.dimensionId); -// if ((tEntity instanceof EntityLivingBase)) { -// if(this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId){ -// System.out.println("move dim"); -// GT_Utility.moveEntityToDimensionAtCoords(tEntity, mTargetD, mTargetX, mTargetY, mTargetZ); -// }else{((EntityLivingBase) tEntity).setPositionAndUpdate(this.mTargetX + 0.5D, this.mTargetY + 0.5D, this.mTargetZ + 0.5D);} -// } else { -// tEntity.setPosition(this.mTargetX + 0.5D, this.mTargetY + 0.5D, this.mTargetZ + 0.5D); -// } + if ((tEntity instanceof EntityLivingBase)) { + ((EntityLivingBase) tEntity).setPositionAndUpdate(this.mTargetX + 0.5D, this.mTargetY + 0.5D, this.mTargetZ + 0.5D); + } else { + tEntity.setPosition(this.mTargetX + 0.5D, this.mTargetY + 0.5D, this.mTargetZ + 0.5D); + } } } } |