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

Nobody cares about creative mode

Browse Source
This commit is contained in:
Brady
2018-12-24 12:19:09 -06:00
parent 7b2930d5e5
commit c6ce5ea160
1 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/baritone/bot/spec/BotPlayerController.java
+11 -30
View File
@@ -74,13 +74,6 @@ public class BotPlayerController implements IPlayerController {
return true; return true;
} }
if (this.gameType.isCreative() && world.getWorldBorder().contains(pos)) {
player.connection.sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, pos, side));
handleCreativeBreak(pos, side);
this.blockHitDelay = 5;
return true;
}
if (!this.isHittingPosition(pos)) { if (!this.isHittingPosition(pos)) {
return this.clickBlock(pos, side); return this.clickBlock(pos, side);
} }
@@ -159,11 +152,7 @@ public class BotPlayerController implements IPlayerController {
return false; return false;
} }
if (this.gameType.isCreative()) { if (!this.hittingBlock || !this.isHittingPosition(pos)) {
player.connection.sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, pos, side));
handleCreativeBreak(pos, side);
this.blockHitDelay = 5;
} else if (!this.hittingBlock || !this.isHittingPosition(pos)) {
if (this.hittingBlock) { if (this.hittingBlock) {
player.connection.sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.ABORT_DESTROY_BLOCK, this.currentBlock, side)); player.connection.sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.ABORT_DESTROY_BLOCK, this.currentBlock, side));
} }
@@ -194,10 +183,6 @@ public class BotPlayerController implements IPlayerController {
EntityBot player = this.user.getEntity(); EntityBot player = this.user.getEntity();
World world = player.world; World world = player.world;
if (this.gameType.isCreative() && !player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() instanceof ItemSword) {
return;
}
IBlockState state = world.getBlockState(pos); IBlockState state = world.getBlockState(pos);
Block block = state.getBlock(); Block block = state.getBlock();
@@ -217,31 +202,27 @@ public class BotPlayerController implements IPlayerController {
this.currentBlock = new BlockPos(this.currentBlock.getX(), -1, this.currentBlock.getZ()); this.currentBlock = new BlockPos(this.currentBlock.getX(), -1, this.currentBlock.getZ());
if (!this.gameType.isCreative()) { ItemStack stack = player.getHeldItemMainhand();
ItemStack stack = player.getHeldItemMainhand();
if (!stack.isEmpty()) { if (!stack.isEmpty()) {
stack.onBlockDestroyed(world, state, pos, player); stack.onBlockDestroyed(world, state, pos, player);
if (stack.isEmpty()) { if (stack.isEmpty()) {
player.setHeldItem(EnumHand.MAIN_HAND, ItemStack.EMPTY); player.setHeldItem(EnumHand.MAIN_HAND, ItemStack.EMPTY);
}
} }
} }
} }
private void handleCreativeBreak(BlockPos pos, EnumFacing side) {
EntityPlayer player = this.user.getEntity();
if (!player.world.extinguishFire(player, pos, side)) {
this.handleBreak(pos);
}
}
private boolean canBreak(EntityPlayer player, BlockPos pos) { private boolean canBreak(EntityPlayer player, BlockPos pos) {
if (!player.world.getWorldBorder().contains(pos)) { if (!player.world.getWorldBorder().contains(pos)) {
return false; return false;
} }
// Get OUTTA HERE
if (this.gameType.isCreative()) {
return false;
}
if (this.gameType.hasLimitedInteractions()) { if (this.gameType.hasLimitedInteractions()) {
if (this.gameType == GameType.SPECTATOR) { if (this.gameType == GameType.SPECTATOR) {
return false; return false;