mirror of
https://github.com/kolbytn/mindcraft.git
synced 2025-08-16 12:15:36 +02:00
Delete patches directory
This commit is contained in:
parent
3badd59c78
commit
fea6413b40
4 changed files with 0 additions and 81 deletions
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/node_modules/mineflayer/lib/plugins/place_block.js b/node_modules/mineflayer/lib/plugins/place_block.js
|
|
||||||
index fdaec6b..08983b6 100644
|
|
||||||
--- a/node_modules/mineflayer/lib/plugins/place_block.js
|
|
||||||
+++ b/node_modules/mineflayer/lib/plugins/place_block.js
|
|
||||||
@@ -11,7 +11,7 @@ function inject (bot) {
|
|
||||||
let newBlock = bot.blockAt(dest)
|
|
||||||
if (oldBlock.type === newBlock.type) {
|
|
||||||
[oldBlock, newBlock] = await onceWithCleanup(bot, `blockUpdate:${dest}`, {
|
|
||||||
- timeout: 5000,
|
|
||||||
+ timeout: 500,
|
|
||||||
// Condition to wait to receive block update actually changing the block type, in case the bot receives block updates with no changes
|
|
||||||
// oldBlock and newBlock will both be null when the world unloads
|
|
||||||
checkCondition: (oldBlock, newBlock) => !oldBlock || !newBlock || oldBlock.type !== newBlock.type
|
|
|
@ -1,35 +0,0 @@
|
||||||
diff --git a/node_modules/mineflayer-collectblock/lib/CollectBlock.js b/node_modules/mineflayer-collectblock/lib/CollectBlock.js
|
|
||||||
index 2c11e8c..bb49c11 100644
|
|
||||||
--- a/node_modules/mineflayer-collectblock/lib/CollectBlock.js
|
|
||||||
+++ b/node_modules/mineflayer-collectblock/lib/CollectBlock.js
|
|
||||||
@@ -77,10 +77,11 @@ function mineBlock(bot, block, options) {
|
|
||||||
}
|
|
||||||
yield bot.tool.equipForBlock(block, equipToolOptions);
|
|
||||||
// @ts-expect-error
|
|
||||||
- if (!block.canHarvest(bot.heldItem)) {
|
|
||||||
+ if (bot.heldItem !== null && !block.canHarvest(bot.heldItem.type)) {
|
|
||||||
options.targets.removeTarget(block);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
const tempEvents = new TemporarySubscriber_1.TemporarySubscriber(bot);
|
|
||||||
tempEvents.subscribeTo('itemDrop', (entity) => {
|
|
||||||
if (entity.position.distanceTo(block.position.offset(0.5, 0.5, 0.5)) <= 0.5) {
|
|
||||||
@@ -92,7 +93,7 @@ function mineBlock(bot, block, options) {
|
|
||||||
// Waiting for items to drop
|
|
||||||
yield new Promise(resolve => {
|
|
||||||
let remainingTicks = 10;
|
|
||||||
- tempEvents.subscribeTo('physicTick', () => {
|
|
||||||
+ tempEvents.subscribeTo('physicsTick', () => {
|
|
||||||
remainingTicks--;
|
|
||||||
if (remainingTicks <= 0) {
|
|
||||||
tempEvents.cleanup();
|
|
||||||
@@ -195,6 +196,8 @@ class CollectBlock {
|
|
||||||
throw (0, Util_1.error)('UnresolvedDependency', 'The mineflayer-collectblock plugin relies on the mineflayer-tool plugin to run!');
|
|
||||||
}
|
|
||||||
if (this.movements != null) {
|
|
||||||
+ this.movements.dontMineUnderFallingBlock = false;
|
|
||||||
+ this.movements.dontCreateFlow = false;
|
|
||||||
this.bot.pathfinder.setMovements(this.movements);
|
|
||||||
}
|
|
||||||
if (!optionsFull.append)
|
|
|
@ -1,20 +0,0 @@
|
||||||
diff --git a/node_modules/mineflayer-pathfinder/index.js b/node_modules/mineflayer-pathfinder/index.js
|
|
||||||
index b38bd30..bf16a63 100644
|
|
||||||
--- a/node_modules/mineflayer-pathfinder/index.js
|
|
||||||
+++ b/node_modules/mineflayer-pathfinder/index.js
|
|
||||||
@@ -550,6 +550,7 @@ function inject (bot) {
|
|
||||||
lockEquipItem.release()
|
|
||||||
const refBlock = bot.blockAt(new Vec3(placingBlock.x, placingBlock.y, placingBlock.z), false)
|
|
||||||
if (!lockPlaceBlock.tryAcquire()) return
|
|
||||||
+ bot.world.setBlockStateId(refBlock.position.offset(placingBlock.dx, placingBlock.dy, placingBlock.dz), 1)
|
|
||||||
if (interactableBlocks.includes(refBlock.name)) {
|
|
||||||
bot.setControlState('sneak', true)
|
|
||||||
}
|
|
||||||
@@ -557,6 +558,7 @@ function inject (bot) {
|
|
||||||
.then(function () {
|
|
||||||
// Dont release Sneak if the block placement was not successful
|
|
||||||
bot.setControlState('sneak', false)
|
|
||||||
+ bot.setControlState('jump', false)
|
|
||||||
if (bot.pathfinder.LOSWhenPlacingBlocks && placingBlock.returnPos) returningPos = placingBlock.returnPos.clone()
|
|
||||||
})
|
|
||||||
.catch(_ignoreError => {
|
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/node_modules/mineflayer-pvp/lib/PVP.js b/node_modules/mineflayer-pvp/lib/PVP.js
|
|
||||||
index 758c2b3..7c7220e 100644
|
|
||||||
--- a/node_modules/mineflayer-pvp/lib/PVP.js
|
|
||||||
+++ b/node_modules/mineflayer-pvp/lib/PVP.js
|
|
||||||
@@ -48,7 +48,7 @@ class PVP {
|
|
||||||
this.meleeAttackRate = new TimingSolver_1.MaxDamageOffset();
|
|
||||||
this.bot = bot;
|
|
||||||
this.movements = new mineflayer_pathfinder_1.Movements(bot, require('minecraft-data')(bot.version));
|
|
||||||
- this.bot.on('physicTick', () => this.update());
|
|
||||||
+ this.bot.on('physicsTick', () => this.update());
|
|
||||||
this.bot.on('entityGone', e => { if (e === this.target)
|
|
||||||
this.stop(); });
|
|
||||||
}
|
|
Loading…
Add table
Reference in a new issue