0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:cabaletta/baritone

Browse Source
This commit is contained in:
Leijurv 2018-08-25 15:40:33 -07:00
commit 85cf5322f9
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/baritone/pathing/movement/MovementHelper.java
View File

@ -30,6 +30,7 @@ import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.RayTraceResult;
@ -119,41 +120,26 @@ public interface MovementHelper extends ActionCosts, Helper {
} }
static boolean isDoorPassable(BlockPos doorPos, BlockPos playerPos) { static boolean isDoorPassable(BlockPos doorPos, BlockPos playerPos) {
IBlockState door = BlockStateInterface.get(doorPos); if (playerPos.equals(doorPos))
if (!(door.getBlock() instanceof BlockDoor)) {
return true;
}
String facing = door.getValue(BlockDoor.FACING).getName();
boolean open = door.getValue(BlockDoor.OPEN).booleanValue();
/**
* yes this is dumb
* change it if you want
*/
String playerFacing = "";
if (playerPos.equals(doorPos)) {
return false; return false;
}
IBlockState state = BlockStateInterface.get(doorPos);
if (!(state.getBlock() instanceof BlockDoor))
return true;
EnumFacing.Axis facing = state.getValue(BlockDoor.FACING).getAxis();
boolean open = state.getValue(BlockDoor.OPEN);
EnumFacing.Axis playerFacing;
if (playerPos.north().equals(doorPos) || playerPos.south().equals(doorPos)) { if (playerPos.north().equals(doorPos) || playerPos.south().equals(doorPos)) {
playerFacing = "northsouth"; playerFacing = EnumFacing.Axis.Z;
} else if (playerPos.east().equals(doorPos) || playerPos.west().equals(doorPos)) { } else if (playerPos.east().equals(doorPos) || playerPos.west().equals(doorPos)) {
playerFacing = "eastwest"; playerFacing = EnumFacing.Axis.X;
} else { } else {
return true; return true;
} }
if (facing == "north" || facing == "south") { return (facing == playerFacing) == open;
if (open) {
return playerFacing == "northsouth";
} else {
return playerFacing == "eastwest";
}
} else {
if (open) {
return playerFacing == "eastwest";
} else {
return playerFacing == "northsouth";
}
}
} }
static boolean avoidWalkingInto(Block block) { static boolean avoidWalkingInto(Block block) {