attempt to fix vehicle release in events called in vehicle sync

openmultiplayer · Sep 17, 2024 · a9f4c2a · a9f4c2a
1 parent c0df2d9
commit a9f4c2a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Server/Source/player_pool.hpp b/Server/Source/player_pool.hpp
@@ -1128,7 +1128,9 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 				return false;
 			}
 
-			IVehicle& vehicle = *vehiclePtr;
+			ScopedPoolReleaseLock lock(*self.vehiclesComponent, *vehiclePtr);
+			IVehicle& vehicle = *lock.entry;
+
 			Player& player = static_cast<Player&>(peer);
 			player.pos_ = vehicleSync.Position;
 			player.health_ = vehicleSync.PlayerHealthArmour.x;
@@ -1379,7 +1381,8 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 				return false;
 			}
 
-			IVehicle& vehicle = *vehiclePtr;
+			ScopedPoolReleaseLock lock(*self.vehiclesComponent, *vehiclePtr);
+			IVehicle& vehicle = *lock.entry;
 			Player& player = static_cast<Player&>(peer);
 
 			if (vehicle.isRespawning())