Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix incorrect block placing on engines

Browse source
This commit is contained in:
Anton 2014-04-06 17:42:07 +03:00
parent ca1eb0b4ee
commit 84b1d58320
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/buildcraft/energy/BlockEngine.java
View file

@ -31,6 +31,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.entity.Entity;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import static net.minecraft.util.AxisAlignedBB.getBoundingBox; import static net.minecraft.util.AxisAlignedBB.getBoundingBox;
@ -156,16 +157,23 @@ public class BlockEngine extends BlockBuildCraft {
TileEntity tile = wrd.getTileEntity(x, y, z); TileEntity tile = wrd.getTileEntity(x, y, z);
if (tile instanceof TileEngine){ if (tile instanceof TileEngine){
AxisAlignedBB[] aabbs = boxes[((TileEngine)tile).orientation.ordinal()]; AxisAlignedBB[] aabbs = boxes[((TileEngine)tile).orientation.ordinal()];
MovingObjectPosition closest = null;
for(AxisAlignedBB aabb : aabbs){ for(AxisAlignedBB aabb : aabbs){
MovingObjectPosition mop = aabb.getOffsetBoundingBox(x, y, z).calculateIntercept(origin, direction); MovingObjectPosition mop = aabb.getOffsetBoundingBox(x, y, z).calculateIntercept(origin, direction);
if(mop != null){ if(mop != null){
mop.blockX = x; mop.blockX = x;
mop.blockY = y; mop.blockY = y;
mop.blockZ = z; mop.blockZ = z;
return mop; if (closest != null) {
if (mop.hitVec.distanceTo(origin) < closest.hitVec.distanceTo(origin)) {
closest = mop;
}
} else {
closest = mop;
} }
} }
return null; }
return closest;
} else { } else {
return super.collisionRayTrace(wrd, x, y, z, origin, direction); return super.collisionRayTrace(wrd, x, y, z, origin, direction);
} }