mirrors/mindcraft
1
0
Fork 0
mirror of https://github.com/kolbytn/mindcraft.git synced 2025-08-21 22:53:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

crash when fail to stop, improve digging

Browse source
This commit is contained in:
MaxRobinsonTheGreat 2024-02-03 12:00:33 -06:00
parent f203b7ca4e
commit 913b39b0b6
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/agent/coder.js
View file

@ -210,13 +210,17 @@ export class Coder {
async stop() { async stop() {
if (!this.executing) return; if (!this.executing) return;
const start = Date.now();
while (this.executing) { while (this.executing) {
this.agent.bot.interrupt_code = true; this.agent.bot.interrupt_code = true;
this.agent.bot.collectBlock.cancelTask(); this.agent.bot.collectBlock.cancelTask();
this.agent.bot.pathfinder.stop(); this.agent.bot.pathfinder.stop();
this.agent.bot.pvp.stop(); this.agent.bot.pvp.stop();
console.log('waiting for code to finish executing... interrupt:', this.agent.bot.interrupt_code); console.log('waiting for code to finish executing...');
await new Promise(resolve => setTimeout(resolve, 1000)); await new Promise(resolve => setTimeout(resolve, 1000));
if (Date.now() - start > 10 * 1000) {
process.exit(1); // force exit program after 10 seconds of failing to stop
}
} }
} }

21
src/agent/library/skills.js
View file

@ -416,9 +416,24 @@ export async function breakBlockAt(bot, x, y, z) {
* let position = world.getPosition(bot); * let position = world.getPosition(bot);
* await skills.breakBlockAt(bot, position.x, position.y - 1, position.x); * await skills.breakBlockAt(bot, position.x, position.y - 1, position.x);
**/ **/
let current = bot.blockAt(Vec3(x, y, z)); let block = bot.blockAt(Vec3(x, y, z));
if (current.name != 'air') if (block.name !== 'air' && block.name !== 'water' && block.name !== 'lava') {
await bot.dig(current, true); await bot.tool.equipForBlock(block);
const itemId = bot.heldItem ? bot.heldItem.type : null
if (!block.canHarvest(itemId)) {
log(bot, `Don't have right tools to break ${block.name}.`);
return false;
}
if (bot.entity.position.distanceTo(block.position) > 4.5) {
let pos = block.position;
let movements = new pf.Movements(bot);
movements.canPlaceOn = false;
movements.allow1by1towers = false;
bot.pathfinder.setMovements();
await bot.pathfinder.goto(new pf.goals.GoalNear(pos.x, pos.y, pos.z, 4));
}
await bot.dig(block, true);
}
return true; return true;
} }