mineflayer 4.25.0 → 4.26.0

package/.github/workflows/ci.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Use Node.js 18.x
+    - name: Use Node.js 22.x
       uses: actions/setup-node@v1.4.4
       with:
-        node-version: 18.x
+        node-version: 22.x
     - run: npm i && npm run lint
   
   PrepareSupportedVersions:
@@ -25,10 +25,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Use Node.js 18.x
+    - name: Use Node.js 22.x
       uses: actions/setup-node@v1.4.4
       with:
-        node-version: 18.x
+        node-version: 22.x
     - id: set-matrix
       run: |
         node -e "
@@ -45,10 +45,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 18.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v1.4.4
         with:
-          node-version: 18.x
+          node-version: 22.x
       - name: Setup Java JDK
         uses: actions/setup-java@v1.4.3
         with:

package/.github/workflows/npm-publish.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Set up Node.js
       uses: actions/setup-node@master
       with:
-        node-version: 18.0.0
+        node-version: 22.0.0
     - id: publish
       uses: JS-DevTools/npm-publish@v1
       with:

package/docs/history.md

@@ -1,3 +1,9 @@
+## 4.26.0
+* [Use node 22 (#3570)](https://github.com/PrismarineJS/mineflayer/commit/dbff9314418d30df203c32fe83f2a1b56653d0a6) (thanks @rom1504)
+* [Fix infinity setTimeout by throwing error (#3561)](https://github.com/PrismarineJS/mineflayer/commit/69539494c88c2ca718330142839a35414ecd3bda) (thanks @BBpezsgo)
+* [Prevent TypeError when removing event lPrevent TypeError when removing event listeners in switchWorld (BunJS issue maybe)isteners in switchWorld (#3544)](https://github.com/PrismarineJS/mineflayer/commit/e974e703a875d16f5e36d35574bf334a20c76b1b) (thanks @0x15d3v2)
+* [Mounting for other entities and fix bot not dismounting when the vehicle is gone (#3384)](https://github.com/PrismarineJS/mineflayer/commit/08b7317b57ca5c2f1a6ddd116bd0c74c2e10c20c) (thanks @qwqtoday)
+
 ## 4.25.0
 * [1.21.4 (#3546)](https://github.com/PrismarineJS/mineflayer/commit/8bbf5669f5ff3ea8a708633e51b47c312dc7a26b) (thanks @extremeheat)
 

package/index.js

@@ -1,6 +1,6 @@
 if (typeof process !== 'undefined' && !process.browser && process.platform !== 'browser' && parseInt(process.versions.node.split('.')[0]) < 18) {
   console.error('Your node version is currently', process.versions.node)
-  console.error('Please update it to a version >= 18.x.x from https://nodejs.org/')
+  console.error('Please update it to a version >= 22.x.x from https://nodejs.org/')
   process.exit(1)
 }
 

package/lib/plugins/blocks.js

@@ -511,7 +511,7 @@ function inject (bot, { version, storageBuilder, hideErrors }) {
       }
 
       for (const [name, listener] of Object.entries(bot._events)) {
-        if (name.startsWith('blockUpdate:')) {
+        if (name.startsWith('blockUpdate:') && typeof listener === 'function') {
           bot.emit(name, null, null)
           bot.off(name, listener)
         }

package/lib/plugins/digging.js

@@ -24,6 +24,11 @@ function inject (bot) {
       digFace = 'auto'
     }
 
+    const waitTime = bot.digTime(block)
+    if (waitTime === Infinity) {
+      throw new Error(`dig time for ${block?.name ?? block} is Infinity`)
+    }
+
     bot.targetDigFace = 1 // Default (top)
 
     if (forceLook !== 'ignore') {
@@ -127,7 +132,6 @@ function inject (bot) {
       location: block.position,
       face: bot.targetDigFace // default face is 1 (top)
     })
-    const waitTime = bot.digTime(block)
     waitTimeout = setTimeout(finishDigging, waitTime)
     bot.targetDigBlock = block
     bot.swingArm()

package/lib/plugins/entities.js

@@ -803,26 +803,73 @@ function inject (bot) {
 
   // attaching to a vehicle
   bot._client.on('attach_entity', (packet) => {
-    if (packet.entityId !== bot.entity.id) return
-    const vehicle = bot.vehicle
-    if (packet.vehicleId === -1) {
-      bot.vehicle = null
-      bot.emit('dismount', vehicle)
-    } else {
-      bot.vehicle = bot.entities[packet.vehicleId]
-      bot.emit('mount')
+    const passenger = fetchEntity(packet.entityId)
+    const vehicle = packet.vehicleId === -1 ? null : fetchEntity(packet.vehicleId)
+
+    const originalVehicle = passenger.vehicle
+    if (originalVehicle !== null) {
+      const index = originalVehicle.passengers.indexOf(passenger)
+      originalVehicle.passengers = originalVehicle.passengers.splice(index, 1)
+    }
+    passenger.vehicle = vehicle
+    vehicle.passengers.push(passenger)
+
+    if (packet.entityId === bot.entity.id) {
+      const vehicle = bot.vehicle
+      if (packet.vehicleId === -1) {
+        bot.vehicle = null
+        bot.emit('dismount', vehicle)
+      } else {
+        bot.vehicle = bot.entities[packet.vehicleId]
+        bot.emit('mount')
+      }
     }
   })
 
   bot._client.on('set_passengers', ({ entityId, passengers }) => {
-    if (passengers[0] !== bot.entity.id) return
-    const vehicle = bot.vehicle
-    if (entityId === -1) {
+    const passengerEntities = passengers.map((passengerId) => fetchEntity(passengerId))
+    const vehicle = entityId === -1 ? null : bot.entities[entityId]
+
+    for (const passengerEntity of passengerEntities) {
+      const originalVehicle = passengerEntity.vehicle
+      if (originalVehicle !== null) {
+        const index = originalVehicle.passengers.indexOf(passengerEntity)
+        originalVehicle.passengers = originalVehicle.passengers.splice(index, 1)
+      }
+      passengerEntity.vehicle = vehicle
+      if (vehicle !== null) {
+        vehicle.passengers.push(passengerEntity)
+      }
+    }
+
+    if (passengers.includes(bot.entity.id)) {
+      const originalVehicle = bot.vehicle
+      if (entityId === -1) {
+        bot.vehicle = null
+        bot.emit('dismount', originalVehicle)
+      } else {
+        bot.vehicle = bot.entities[entityId]
+        bot.emit('mount')
+      }
+    }
+  })
+
+  // dismounting when the vehicle is gone
+  bot._client.on('entityGone', (entity) => {
+    if (bot.vehicle === entity) {
       bot.vehicle = null
-      bot.emit('dismount', vehicle)
-    } else {
-      bot.vehicle = bot.entities[entityId]
-      bot.emit('mount')
+      bot.emit('dismount', (entity))
+    }
+    if (entity.passengers) {
+      for (const passenger of entity.passengers) {
+        passenger.vehicle = null
+      }
+    }
+    if (entity.vehicle) {
+      const index = entity.vehicle.passengers.indexOf(entity)
+      if (index !== -1) {
+        entity.vehicle.passengers = entity.vehicle.passengers.splice(index, 1)
+      }
     }
   })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mineflayer",
-  "version": "4.25.0",
+  "version": "4.26.0",
   "description": "create minecraft bots with a stable, high level API",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,7 +17,7 @@
     "url": "git://github.com/PrismarineJS/mineflayer.git"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "license": "MIT",
   "dependencies": {
@@ -27,7 +27,7 @@
     "prismarine-block": "^1.17.0",
     "prismarine-chat": "^1.7.1",
     "prismarine-chunk": "^1.36.0",
-    "prismarine-entity": "^2.3.0",
+    "prismarine-entity": "^2.5.0",
     "prismarine-item": "^1.15.0",
     "prismarine-nbt": "^2.0.0",
     "prismarine-physics": "^1.9.0",