Merge branch 'openmultiplayer:master' into master

openmultiplayer · Oct 16, 2024 · cf1a339 · cf1a339
2 parents a227fab + 01d70fb
commit cf1a339
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
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))