Mounting for other entities and fix bot not dismounting when the vehicle is gone (#3384)

* dismounting when the vehicle is gone

* solve my problems temporary

* add mounting and dismounting for other entities

* Revert unnecessary changes
This reverts commit a95ee68.

* not checking the entityId when applying passenger vehicle and vehicle passengers in `attach_entity` in `entities.js`

* make sure the vehicle passengers are correctly removed

* rename vehicle to originalVehicle

* remove passenger from vehicle.passengers after passenger left that vehicle

* push passenger to vehicle.passengers

* remove that 💀

* ensure vehicle is not null in `set_passengers`

* Fix linting errors

* Empty commit

* Point the prismarine-entity package to my branch

* Update package.json

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: extremeheat <extreme@protonmail.ch>
Co-authored-by: Romain Beaumont <romain.rom1@gmail.com>

Author: 4 people

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.json

@@ -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",