diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2018-09-08 17:24:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-08 17:24:41 +0200 |
| commit | 2aeb6e2ca7fb090d2392490aff6d6f87be48fd19 (patch) | |
| tree | 44b5519227abe05557e01dc8645b3ff4f4e7d1ed /src/main/java/gregtech/common/tileentities/machines/basic | |
| parent | 65d3cf01f28a275d186d34f5771e2ec72ccd975d (diff) | |
| parent | fde7ce4cf096684e3af0b88f9af0c062a2068981 (diff) | |
| download | GT5-Unofficial-2aeb6e2ca7fb090d2392490aff6d6f87be48fd19.tar.gz GT5-Unofficial-2aeb6e2ca7fb090d2392490aff6d6f87be48fd19.tar.bz2 GT5-Unofficial-2aeb6e2ca7fb090d2392490aff6d6f87be48fd19.zip | |
Merge pull request #147 from GTNewHorizons/bartimaeusnek-fixes
Various fixes
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/basic')
2 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index 4dcbc95786..8e244ff502 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -1,7 +1,6 @@ package gregtech.common.tileentities.machines.basic;
import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IIndividual;
import gregtech.GT_Mod;
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 7fdb9689a9..c9dbded8f9 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 @@ -309,7 +309,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank { 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))); +// GT_FML_LOGGER.info("teleport"+(Math.pow(tDistance, 1.5))); if (getBaseMetaTileEntity().decreaseStoredEnergyUnits((long) (Math.pow(tDistance, 1.5) * weightCalculation(tEntity) * sFPowerMultiplyer), false)) { //if (hasDimensionalTeleportCapability() && this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId && (hasEgg || mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)))) { // mFluid.amount = mFluid.amount - ((int) Math.min(10, (Math.pow(tDistance, 1.5) * weightCalculation(tEntity) / 8192))); |