Merge branch 'openmultiplayer:master' into master

NexiusTailer · web-flow · commit cf1a33901f85 · 2024-10-16T16:13:06.000+03:00
diff --git a/Server/Components/LegacyNetwork/legacy_network_impl.cpp b/Server/Components/LegacyNetwork/legacy_network_impl.cpp
@@ -795,7 +795,7 @@ void RakNetLegacyNetwork::init(ICore* c)
 
 	core->getEventDispatcher().addEventHandler(this);
 	core->getPlayers().getPlayerChangeDispatcher().addEventHandler(this);
-	core->getPlayers().getPlayerConnectDispatcher().addEventHandler(this);
+	core->getPlayers().getPlayerConnectDispatcher().addEventHandler(this, EventPriority_Lowest);
 }
 
 void RakNetLegacyNetwork::start()
diff --git a/Server/Components/Pawn/Scripting/Player/Natives.cpp b/Server/Components/Pawn/Scripting/Player/Natives.cpp
@@ -879,15 +879,15 @@ SCRIPT_API(GetPlayerMarkerForPlayer, int(IPlayer& player, IPlayer& other))
 	return colour.RGBA();
 }
 
-SCRIPT_API(AllowPlayerTeleport, bool(IPlayer* player, bool allow))
+SCRIPT_API(AllowPlayerTeleport, bool(IPlayer& player, bool allow))
 {
-	player->allowTeleport(allow);
+	player.allowTeleport(allow);
 	return true;
 }
 
-SCRIPT_API(IsPlayerTeleportAllowed, bool(IPlayer* player))
+SCRIPT_API(IsPlayerTeleportAllowed, bool(IPlayer& player))
 {
-	return player->isTeleportAllowed();
+	return player.isTeleportAllowed();
 }
 
 SCRIPT_API(DisableRemoteVehicleCollisions, bool(IPlayer& player, bool disable))

Original file line number	Diff line number	Diff line change
`@@ -795,7 +795,7 @@ void RakNetLegacyNetwork::init(ICore* c)`
`795`	`795`
`796`	`796`	`core->getEventDispatcher().addEventHandler(this);`
`797`	`797`	`core->getPlayers().getPlayerChangeDispatcher().addEventHandler(this);`
`798`		`- core->getPlayers().getPlayerConnectDispatcher().addEventHandler(this);`
	`798`	`+ core->getPlayers().getPlayerConnectDispatcher().addEventHandler(this, EventPriority_Lowest);`
`799`	`799`	`}`
`800`	`800`
`801`	`801`	`void RakNetLegacyNetwork::start()`
Original file line number	Diff line number	Diff line change
`@@ -879,15 +879,15 @@ SCRIPT_API(GetPlayerMarkerForPlayer, int(IPlayer& player, IPlayer& other))`
`879`	`879`	`return colour.RGBA();`
`880`	`880`	`}`
`881`	`881`
`882`		`-SCRIPT_API(AllowPlayerTeleport, bool(IPlayer* player, bool allow))`
	`882`	`+SCRIPT_API(AllowPlayerTeleport, bool(IPlayer& player, bool allow))`
`883`	`883`	`{`
`884`		`- player->allowTeleport(allow);`
	`884`	`+ player.allowTeleport(allow);`
`885`	`885`	`return true;`
`886`	`886`	`}`
`887`	`887`
`888`		`-SCRIPT_API(IsPlayerTeleportAllowed, bool(IPlayer* player))`
	`888`	`+SCRIPT_API(IsPlayerTeleportAllowed, bool(IPlayer& player))`
`889`	`889`	`{`
`890`		`- return player->isTeleportAllowed();`
	`890`	`+ return player.isTeleportAllowed();`
`891`	`891`	`}`
`892`	`892`
`893`	`893`	`SCRIPT_API(DisableRemoteVehicleCollisions, bool(IPlayer& player, bool disable))`