Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 4d1d28f53beb · 2025-02-08T00:40:54.000Z
74c45f8 Fix onPlayerTeleport (#4007) fe72f5c Update client en_US pot
diff --git a/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp b/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp
@@ -132,7 +132,7 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
             position.data.vecPosition += vecTempPos;
         }
 
-        if (position.data.vecPosition.fX != 0.0f && position.data.vecPosition.fY != 0.0f && position.data.vecPosition.fZ != 0.0f)
+        // 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);

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)`
`132`	`132`	`position.data.vecPosition += vecTempPos;`
`133`	`133`	`}`
`134`	`134`
`135`		`- if (position.data.vecPosition.fX != 0.0f && position.data.vecPosition.fY != 0.0f && position.data.vecPosition.fZ != 0.0f)`
	`135`	`+ // if (position.data.vecPosition.fX != 0.0f \|\| position.data.vecPosition.fY != 0.0f \|\| position.data.vecPosition.fZ != 0.0f)`
`136`	`136`	`{`
`137`	`137`	`CVector playerPosition = pSourcePlayer->GetPosition();`
`138`	`138`	`float playerDistancePosition = DistanceBetweenPoints3D(playerPosition, position.data.vecPosition);`