Fixed "reverse search for NPC id in player pool" (#1088)

Author: NoPressF

.github/workflows/build.yml

@@ -33,7 +33,7 @@ on:
 jobs:
   build-windows:
     name: Windows build
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     strategy:
       matrix:

Server/Components/LegacyConfig/config_main.cpp

@@ -66,7 +66,7 @@ const FlatHashMap<StringView, ParamType> types = {
 	{ "timestamp", ParamType::Bool },
 	{ "logtimeformat", ParamType::String },
 	{ "logqueries", ParamType::Bool },
-	{ "chatlogging", ParamType::Bool },
+	{ "chatlogging", ParamType::Custom },
 	{ "db_logging", ParamType::Bool },
 	{ "db_log_queries", ParamType::Bool },
 	{ "onfoot_rate", ParamType::Int },
@@ -209,6 +209,30 @@ class LegacyConfigComponent final : public ILegacyConfigComponent, public Consol
 			return true;
 		}
 
+		if (name.find("chatlogging") == 0)
+		{
+			auto it = dictionary.find("chatlogging");
+
+			Impl::String lower(right);
+			std::transform(lower.begin(), lower.end(), lower.begin(), [](unsigned char c)
+				{
+					return std::tolower(c);
+				});
+
+			if (lower == "true" || lower == "1")
+			{
+				config.setBool(it->second, true);
+				config.setBool("logging.log_deaths", true);
+			}
+			else if (lower == "false" || lower == "0")
+			{
+				config.setBool(it->second, false);
+				config.setBool("logging.log_deaths", false);
+			}
+
+			return true;
+		}
+
 		return false;
 	}
 

Server/Components/Vehicles/vehicle.cpp

@@ -685,7 +685,11 @@ bool Vehicle::isDead()
 
 void Vehicle::_respawn()
 {
-	respawning = true;
+	if (!isTrainCarriage())
+	{
+		respawning = true;
+	}
+
 	const auto& entries = streamedFor_.entries();
 	for (IPlayer* player : entries)
 	{

Server/Components/Vehicles/vehicle.hpp

@@ -48,22 +48,22 @@ class Vehicle final : public IVehicle, public PoolIDProvider, public NoCopy
 	uint8_t landingGear = 1;
 	bool respawning = false;
 	bool detaching = false;
+	bool beenOccupied = false;
 	FlatHashSet<IPlayer*> passengers;
 	HybridString<16> numberPlate = StringView("XYZSR998");
 	uint8_t objective;
 	uint8_t doorsLocked;
+	uint8_t sirenState = 0;
 	VehicleDeathData deathData;
 	TimePoint timeOfSpawn;
 	TimePoint lastOccupiedChange;
-	bool beenOccupied = false;
 	Vector3 velocity = Vector3(0.0f, 0.0f, 0.0f);
 	Vector3 angularVelocity = Vector3(0.0f, 0.0f, 0.0f);
 	TimePoint trailerUpdateTime;
 	Vehicle* trailer = nullptr;
 	Vehicle* cab = nullptr;
 	StaticArray<IVehicle*, MAX_VEHICLE_CARRIAGES> carriages;
 	VehicleParams params;
-	uint8_t sirenState = 0;
 	uint32_t hydraThrustAngle = 0;
 	float trainSpeed = 0.0f;
 	int lastDriverPoolID = INVALID_PLAYER_ID;
@@ -391,6 +391,12 @@ class Vehicle final : public IVehicle, public PoolIDProvider, public NoCopy
 		return carriages;
 	}
 
+	bool isTrainCarriage()
+	{
+		const int model = getModel();
+		return (model == 569 || model == 570);
+	}
+
 	/// Sets the velocity of the vehicle.
 	void setVelocity(Vector3 velocity) override;
 

Server/Components/Vehicles/vehicles_impl.hpp

@@ -48,7 +48,8 @@ class VehiclesComponent final : public IVehiclesComponent, public CoreEventHandl
 				return false;
 			}
 
-			if (!lock.entry->isStreamedInForPlayer(peer) || peer.getState() != PlayerState_OnFoot)
+			Vehicle* lockedVehicle = static_cast<Vehicle*>(lock.entry);
+			if ((!lockedVehicle->isStreamedInForPlayer(peer) && !lockedVehicle->isTrainCarriage()) || peer.getState() != PlayerState_OnFoot)
 			{
 				return false;
 			}
@@ -90,8 +91,9 @@ class VehiclesComponent final : public IVehiclesComponent, public CoreEventHandl
 				return false;
 			}
 
+			Vehicle* lockedVehicle = static_cast<Vehicle*>(lock.entry);
 			IPlayerVehicleData* vehData = queryExtension<IPlayerVehicleData>(peer);
-			if (vehData == nullptr || !lock.entry->isStreamedInForPlayer(peer) || !(peer.getState() == PlayerState_Driver || peer.getState() == PlayerState_Passenger) || vehData->getVehicle() != lock.entry)
+			if (vehData == nullptr || (!lockedVehicle->isStreamedInForPlayer(peer) && !lockedVehicle->isTrainCarriage()) || !(peer.getState() == PlayerState_Driver || peer.getState() == PlayerState_Passenger) || vehData->getVehicle() != lock.entry)
 			{
 				return false;
 			}

Server/Source/player_pool.hpp

@@ -1390,7 +1390,9 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 			Player& player = static_cast<Player&>(peer);
 
 			if (vehicle.isRespawning())
+			{
 				return false;
+			}
 
 			const bool vehicleOk = vehicle.updateFromPassengerSync(passengerSync, peer);
 
@@ -1695,7 +1697,8 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 
 		if (params.bot)
 		{
-			for (auto index = storage.Capacity - 1; index >= 0; --index)
+			static const auto maxPlayers = core.getConfig().getInt("max_players");
+			for (auto index = *maxPlayers - 1; index >= 0; --index)
 			{
 				if (storage.get(index) == nullptr)
 				{

Shared/NetCode/vehicle.hpp

@@ -111,15 +111,15 @@ namespace RPC
 		float Angle;
 		uint8_t Colour1;
 		uint8_t Colour2;
-		float Health;
 		uint8_t Interior;
+		uint8_t Paintjob;
+		float Health;
 		uint32_t DoorDamage;
 		uint32_t PanelDamage;
 		uint8_t LightDamage;
 		uint8_t TyreDamage;
 		uint8_t Siren;
 		StaticArray<int, MAX_VEHICLE_COMPONENT_SLOT_IN_RPC> Mods;
-		uint8_t Paintjob;
 		int32_t BodyColour1;
 		int32_t BodyColour2;