Renamed callbacks

NoPressF · NoPressF · commit 32c833b6a4b8 · 2025-05-24T20:01:02.000+02:00
diff --git a/SDK b/SDK
@@ -1 +1 @@
-Subproject commit 8cc0b22770e3576a1685b4147751af5335ee0d2a
+Subproject commit bea039215233df2eda0e0ae361437e861b18862a
diff --git a/Server/Components/Pawn/Scripting/Vehicle/Events.hpp b/Server/Components/Pawn/Scripting/Vehicle/Events.hpp
@@ -122,22 +122,22 @@ struct VehicleEvents : public VehicleEventHandler, public Singleton<VehicleEvent
 		return !!ret;
 	}
 
-	bool onVehicleTrailerAttach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
+	bool onTrailerAttach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
 	{
-		cell ret = PawnManager::Get()->CallInSides("OnVehicleTrailerAttach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());
+		cell ret = PawnManager::Get()->CallInSides("OnTrailerAttach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());
 		if (!ret)
 		{
-			ret = PawnManager::Get()->CallInEntry("OnVehicleTrailerAttach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());
+			ret = PawnManager::Get()->CallInEntry("OnTrailerAttach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());
 		}
 		return !!ret;
 	}
 
-	bool onVehicleTrailerDetach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
+	bool onTrailerDetach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override
 	{
-		cell ret = PawnManager::Get()->CallInSides("OnVehicleTrailerDetach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());
+		cell ret = PawnManager::Get()->CallInSides("OnTrailerDetach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());
 		if (!ret)
 		{
-			ret = PawnManager::Get()->CallInEntry("OnVehicleTrailerDetach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());
+			ret = PawnManager::Get()->CallInEntry("OnTrailerDetach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());
 		}
 		return !!ret;
 	}
diff --git a/Server/Components/Vehicles/vehicle.cpp b/Server/Components/Vehicles/vehicle.cpp
@@ -244,7 +244,7 @@ bool Vehicle::updateFromDriverSync(const VehicleDriverSyncPacket& vehicleSync, I
 
 					static_cast<DefaultEventDispatcher<VehicleEventHandler>&>(pool->getEventDispatcher()).stopAtFalse([&player, this](VehicleEventHandler* handler)
 					{
-						return handler->onVehicleTrailerAttach(player, *this, *trailer);
+						return handler->onTrailerAttach(player, *this, *trailer);
 					});
 				}
 			}
@@ -260,7 +260,7 @@ bool Vehicle::updateFromDriverSync(const VehicleDriverSyncPacket& vehicleSync, I
 		{
 			static_cast<DefaultEventDispatcher<VehicleEventHandler>&>(pool->getEventDispatcher()).stopAtFalse([&player, this](VehicleEventHandler* handler)
 			{
-				return handler->onVehicleTrailerDetach(player, *this, *trailer);
+				return handler->onTrailerDetach(player, *this, *trailer);
 			});
 			
 			trailer->cab = nullptr;
diff --git a/lib/RakNet b/lib/RakNet
@@ -1 +1 @@
-Subproject commit 7bfb64ad99584ba2efcff68a2e096f6edc276291
+Subproject commit 03d7129e2c5e3b7efa851cf889dacf0a0d167aa1

Original file line number	Diff line number	Diff line change
`@@ -122,22 +122,22 @@ struct VehicleEvents : public VehicleEventHandler, public Singleton<VehicleEvent`
`122`	`122`	`return !!ret;`
`123`	`123`	`}`
`124`	`124`
`125`		`- bool onVehicleTrailerAttach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override`
	`125`	`+ bool onTrailerAttach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override`
`126`	`126`	`{`
`127`		`- cell ret = PawnManager::Get()->CallInSides("OnVehicleTrailerAttach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());`
	`127`	`+ cell ret = PawnManager::Get()->CallInSides("OnTrailerAttach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());`
`128`	`128`	`if (!ret)`
`129`	`129`	`{`
`130`		`- ret = PawnManager::Get()->CallInEntry("OnVehicleTrailerAttach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());`
	`130`	`+ ret = PawnManager::Get()->CallInEntry("OnTrailerAttach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());`
`131`	`131`	`}`
`132`	`132`	`return !!ret;`
`133`	`133`	`}`
`134`	`134`
`135`		`- bool onVehicleTrailerDetach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override`
	`135`	`+ bool onTrailerDetach(IPlayer& player, IVehicle& vehicle, IVehicle& trailer) override`
`136`	`136`	`{`
`137`		`- cell ret = PawnManager::Get()->CallInSides("OnVehicleTrailerDetach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());`
	`137`	`+ cell ret = PawnManager::Get()->CallInSides("OnTrailerDetach", DefaultReturnValue_False, player.getID(), vehicle.getID(), trailer.getID());`
`138`	`138`	`if (!ret)`
`139`	`139`	`{`
`140`		`- ret = PawnManager::Get()->CallInEntry("OnVehicleTrailerDetach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());`
	`140`	`+ ret = PawnManager::Get()->CallInEntry("OnTrailerDetach", DefaultReturnValue_True, player.getID(), vehicle.getID(), trailer.getID());`
`141`	`141`	`}`
`142`	`142`	`return !!ret;`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ bool Vehicle::updateFromDriverSync(const VehicleDriverSyncPacket& vehicleSync, I`
`244`	`244`
`245`	`245`	`static_cast<DefaultEventDispatcher<VehicleEventHandler>&>(pool->getEventDispatcher()).stopAtFalse([&player, this](VehicleEventHandler* handler)`
`246`	`246`	`{`
`247`		`- return handler->onVehicleTrailerAttach(player, this, trailer);`
	`247`	`+ return handler->onTrailerAttach(player, this, trailer);`
`248`	`248`	`});`
`249`	`249`	`}`
`250`	`250`	`}`
`@@ -260,7 +260,7 @@ bool Vehicle::updateFromDriverSync(const VehicleDriverSyncPacket& vehicleSync, I`
`260`	`260`	`{`
`261`	`261`	`static_cast<DefaultEventDispatcher<VehicleEventHandler>&>(pool->getEventDispatcher()).stopAtFalse([&player, this](VehicleEventHandler* handler)`
`262`	`262`	`{`
`263`		`- return handler->onVehicleTrailerDetach(player, this, trailer);`
	`263`	`+ return handler->onTrailerDetach(player, this, trailer);`
`264`	`264`	`});`
`265`	`265`
`266`	`266`	`trailer->cab = nullptr;`