Fix potential null vehicle passengers array in entities plugin

lib/plugins/entities.js

@@ -806,13 +806,21 @@ function inject (bot) {
     const passenger = fetchEntity(packet.entityId)
     const vehicle = packet.vehicleId === -1 ? null : fetchEntity(packet.vehicleId)
 
+    // Initialize passengers arrays if they don't exist
+    if (!passenger.passengers) passenger.passengers = []
+    if (vehicle && !vehicle.passengers) vehicle.passengers = []
+
     const originalVehicle = passenger.vehicle
-    if (originalVehicle !== null) {
+    if (originalVehicle && originalVehicle.passengers && Array.isArray(originalVehicle.passengers)) {
       const index = originalVehicle.passengers.indexOf(passenger)
-      originalVehicle.passengers = originalVehicle.passengers.splice(index, 1)
+      if (index !== -1) {
+        originalVehicle.passengers.splice(index, 1)
+      }
     }
     passenger.vehicle = vehicle
-    vehicle.passengers.push(passenger)
+    if (vehicle && vehicle.passengers && Array.isArray(vehicle.passengers)) {
+      vehicle.passengers.push(passenger)
+    }
 
     if (packet.entityId === bot.entity.id) {
       const vehicle = bot.vehicle
@@ -830,14 +838,27 @@ function inject (bot) {
     const passengerEntities = passengers.map((passengerId) => fetchEntity(passengerId))
     const vehicle = entityId === -1 ? null : bot.entities[entityId]
 
+    if (vehicle && !vehicle.passengers) {
+      vehicle.passengers = []
+    }
+
     for (const passengerEntity of passengerEntities) {
+      if (!passengerEntity) continue
+
+      if (!passengerEntity.passengers) {
+        passengerEntity.passengers = []
+      }
+
       const originalVehicle = passengerEntity.vehicle
-      if (originalVehicle !== null) {
+      if (originalVehicle && originalVehicle.passengers && Array.isArray(originalVehicle.passengers)) {
         const index = originalVehicle.passengers.indexOf(passengerEntity)
-        originalVehicle.passengers = originalVehicle.passengers.splice(index, 1)
+        if (index !== -1) {
+          originalVehicle.passengers.splice(index, 1)
+        }
       }
+
       passengerEntity.vehicle = vehicle
-      if (vehicle !== null) {
+      if (vehicle && vehicle.passengers && Array.isArray(vehicle.passengers)) {
         vehicle.passengers.push(passengerEntity)
       }
     }
@@ -856,19 +877,23 @@ function inject (bot) {
 
   // dismounting when the vehicle is gone
   bot._client.on('entityGone', (entity) => {
+    if (!entity) return
+
     if (bot.vehicle === entity) {
       bot.vehicle = null
-      bot.emit('dismount', (entity))
+      bot.emit('dismount', entity)
     }
-    if (entity.passengers) {
+    if (entity.passengers && Array.isArray(entity.passengers)) {
       for (const passenger of entity.passengers) {
-        passenger.vehicle = null
+        if (passenger) {
+          passenger.vehicle = null
+        }
       }
     }
-    if (entity.vehicle) {
+    if (entity.vehicle && entity.vehicle.passengers && Array.isArray(entity.vehicle.passengers)) {
       const index = entity.vehicle.passengers.indexOf(entity)
       if (index !== -1) {
-        entity.vehicle.passengers = entity.vehicle.passengers.splice(index, 1)
+        entity.vehicle.passengers.splice(index, 1)
       }
     }
   })
@@ -975,7 +1000,13 @@ function inject (bot) {
   }
 
   function fetchEntity (id) {
-    return bot.entities[id] || (bot.entities[id] = new Entity(id))
+    if (!bot.entities[id]) {
+      const entity = new Entity(id)
+      entity.passengers = []
+      bot.entities[id] = entity
+      return entity
+    }
+    return bot.entities[id]
   }
 }
 

lib/plugins/game.js

@@ -65,10 +65,12 @@ function inject (bot, options) {
       if (packet.worldType && !bot.game.dimension) {
         bot.game.dimension = packet.worldType.replace('minecraft:', '')
       }
-      const dimData = bot.registry.dimensionsByName[bot.game.dimension]
-      if (dimData) {
-        bot.game.minY = dimData.minY
-        bot.game.height = dimData.height
+      if (bot.registry.dimensionsByName) {
+        const dimData = bot.registry.dimensionsByName[bot.game.dimension]
+        if (dimData) {
+          bot.game.minY = dimData.minY
+          bot.game.height = dimData.height
+        }
       }
     } else if (bot.supportFeature('dimensionDataIsAvailable')) { // 1.16.2+
       const dimensionData = nbt.simplify(packet.dimension)