Skip to content

Fix false positive in onPlayerTeleport event when using spawnPlayer #3990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2025
Merged

Fix false positive in onPlayerTeleport event when using spawnPlayer #3990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Server/mods/deathmatch/logic/CMapManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@ void CMapManager::SpawnPlayer(CPlayer& Player, const CVector& vecPosition, float

// Update the player data
Player.SetSpawned(true);
Player.SetTeleported(true);
Player.SetHealth(Player.GetMaxHealth());
Player.SetIsDead(false);
Player.SetWearingGoggles(false);
Expand Down
21 changes: 13 additions & 8 deletions Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,20 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
position.data.vecPosition += vecTempPos;
}

CVector playerPosition = pSourcePlayer->GetPosition();
float playerDistancePosition = DistanceBetweenPoints3D(playerPosition, position.data.vecPosition);
if (playerDistancePosition >= g_TickRateSettings.playerTeleportAlert) {
if (!pSourcePlayer->GetTeleported()) {
CLuaArguments arguments;
pSourcePlayer->CallEvent("onPlayerTeleport", arguments, nullptr);
}
if (position.data.vecPosition.fX != 0.0f && position.data.vecPosition.fY != 0.0f && position.data.vecPosition.fZ != 0.0f)
{
CVector playerPosition = pSourcePlayer->GetPosition();
float playerDistancePosition = DistanceBetweenPoints3D(playerPosition, position.data.vecPosition);
if (playerDistancePosition >= g_TickRateSettings.playerTeleportAlert)
{
if (!pSourcePlayer->GetTeleported())
{
CLuaArguments arguments;
pSourcePlayer->CallEvent("onPlayerTeleport", arguments, nullptr);
}

pSourcePlayer->SetTeleported(false);
pSourcePlayer->SetTeleported(false);
}
}

pSourcePlayer->SetPosition(position.data.vecPosition);
Expand Down
Loading