Skip to content

Change height checks to integrated MC method #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change height checks to integrated MC method #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,9 @@ public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle )

private TurtleCommandResult canEnter( TurtlePlayer turtlePlayer, World world, BlockPos position )
{
if( position.getY() < 0 )
if( world.isOutsideBuildHeight( position ) )
{
return TurtleCommandResult.failure( "Too low to move" );
}
else if( position.getY() > world.getHeight() - 1 )
{
return TurtleCommandResult.failure( "Too high to move" );
return TurtleCommandResult.failure( "Move would be outside world height." );
}
if( ComputerCraft.turtlesObeyBlockProtection )
{
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/dan200/computercraft/shared/util/InventoryUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ public static ItemStack copyItem( @Nonnull ItemStack a )
public static IItemHandler getInventory( World world, BlockPos pos, EnumFacing side )
{
// Look for tile with inventory
int y = pos.getY();
if( y >= 0 && y < world.getHeight() )
if( !world.isOutsideBuildHeight( pos ) )
{
TileEntity tileEntity = world.getTileEntity( pos );
if( tileEntity != null )
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dan200/computercraft/shared/util/WorldUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class WorldUtil
{
public static boolean isBlockInWorld( World world, BlockPos pos )
{
return pos.getY() >= 0 && pos.getY() < world.getHeight();
return !world.isOutsideBuildHeight( pos );
}

public static boolean isLiquidBlock( World world, BlockPos pos )
Expand Down