diff options
| author | Martin Robertz <dream-master@gmx.net> | 2018-08-21 07:42:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-21 07:42:49 +0200 |
| commit | cf69ebf523439361ac3d7bce23939c16a78fe96f (patch) | |
| tree | 1d27879eff3080164c22a6be2cff3a57dd92fc44 /src/main/java/gregtech/common | |
| parent | 0e1f3bb153dc1c572dc71952a156d01cba13a7f0 (diff) | |
| parent | ec4626d71772d1a44a48ab3c406f81e9203a78d5 (diff) | |
| download | GT5-Unofficial-cf69ebf523439361ac3d7bce23939c16a78fe96f.tar.gz GT5-Unofficial-cf69ebf523439361ac3d7bce23939c16a78fe96f.tar.bz2 GT5-Unofficial-cf69ebf523439361ac3d7bce23939c16a78fe96f.zip | |
Merge pull request #138 from GTNewHorizons/bartimaeusnek-fixes
fixed GT Teleporter
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java | 15 |
1 files changed, 14 insertions, 1 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 224c9d185e..7fdb9689a9 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 @@ -34,6 +34,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fluids.FluidStack; +import java.util.List; + import static gregtech.api.enums.GT_Values.V; public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank { @@ -257,6 +259,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank { @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + if (mFluid != null) {//Was if null -> Materials.Nitrogen.getPlasma(0); mFluid = null; } @@ -293,7 +296,17 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank { } } - for (Object tObject : getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) + 2))) { + List entities_in_box = getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB( + Entity.class,AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(),2) - 1, + getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, + getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, + getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, + getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, + getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) + 2) + ); + + for (Object tObject : entities_in_box) { if (((tObject instanceof Entity)) && (!((Entity) tObject).isDead)) { Entity tEntity = (Entity) tObject; // System.out.println("teleport"+(Math.pow(tDistance, 1.5))); |