Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit fa2fc83901d0 · 2025-07-15T02:58:10.000Z
3b013dd Fix incorrect onPlayerTeleport trigger on destroyed contact element (#4298)
diff --git a/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp b/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp
@@ -101,6 +101,13 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
             }
         }
 
+        // If the client reported contact but the element doesn't exist anymore,
+        // the coordinates become invalid as they are relative to that element.
+        if (positionRead && pContactElement == nullptr && flags.data.bHasContact)
+        {
+            position.data.vecPosition = pSourcePlayer->GetPosition();
+        }
+        
         CElement* pPreviousContactElement = pSourcePlayer->GetContactElement();
         pSourcePlayer->SetContactElement(pContactElement);
 

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,13 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ // If the client reported contact but the element doesn't exist anymore,`
	`105`	`+ // the coordinates become invalid as they are relative to that element.`
	`106`	`+ if (positionRead && pContactElement == nullptr && flags.data.bHasContact)`
	`107`	`+ {`
	`108`	`+ position.data.vecPosition = pSourcePlayer->GetPosition();`
	`109`	`+ }`
	`110`	`+`
`104`	`111`	`CElement* pPreviousContactElement = pSourcePlayer->GetContactElement();`
`105`	`112`	`pSourcePlayer->SetContactElement(pContactElement);`
`106`	`113`