From 02e5a161dcb5915e44e5c2b1a397ca3faa708aeb Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Wed, 18 Nov 2015 17:00:47 +0100
Subject: [PATCH] Making Phantom Device Range being tested better

---
 .../tile/TileEntityPhantomPlacer.java            | 16 ++--------------
 .../tile/TileEntityPhantomface.java              | 16 ++--------------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java
index 0c484d001..f42cf5232 100644
--- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java
+++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomPlacer.java
@@ -17,6 +17,7 @@ import ellpeck.actuallyadditions.util.WorldUtil;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -101,20 +102,7 @@ public class TileEntityPhantomPlacer extends TileEntityInventoryBase implements
 
     @Override
     public boolean isBoundThingInRange(){
-        if(this.hasBoundPosition()){
-            int xDif = this.boundPosition.getX()-this.xCoord;
-            int yDif = this.boundPosition.getY()-this.yCoord;
-            int zDif = this.boundPosition.getZ()-this.zCoord;
-
-            if(xDif >= -this.range && xDif <= this.range){
-                if(yDif >= -this.range && yDif <= this.range){
-                    if(zDif >= -this.range && zDif <= this.range){
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
+        return this.hasBoundPosition() && this.boundPosition.toVec().distanceTo(Vec3.createVectorHelper(xCoord, yCoord, zCoord)) <= this.range;
     }
 
     @Override
diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java
index cb8919913..ceeee5c4d 100644
--- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java
+++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityPhantomface.java
@@ -20,6 +20,7 @@ import ellpeck.actuallyadditions.util.WorldUtil;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
 public class TileEntityPhantomface extends TileEntityInventoryBase implements IPhantomTile{
@@ -104,20 +105,7 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP
 
     @Override
     public boolean isBoundThingInRange(){
-        if(this.hasBoundPosition()){
-            int xDif = this.boundPosition.getX()-this.xCoord;
-            int yDif = this.boundPosition.getY()-this.yCoord;
-            int zDif = this.boundPosition.getZ()-this.zCoord;
-
-            if(xDif >= -this.range && xDif <= this.range){
-                if(yDif >= -this.range && yDif <= this.range){
-                    if(zDif >= -this.range && zDif <= this.range){
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
+        return this.hasBoundPosition() && this.boundPosition.toVec().distanceTo(Vec3.createVectorHelper(xCoord, yCoord, zCoord)) <= this.range;
     }
 
     @Override