Added server side weapon related checks #3272
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…g, and don't send potentially incorrect weapon data
|
So that was the problem all this time along. Lets hope this gets merged asap. |
|
Seems to keep happening to some extent. Version r22335 (Linux x64). Useful information:
That's about it. |
|
What about explosions/damage caused by those shots (rpgs for example)? |
Pirulax
reviewed
Dec 29, 2023
| @@ -45,7 +45,7 @@ jobs: | |||
| - name: Create build artifacts | |||
| run: utils\premake5 compose_files | |||
|
|
|||
| - uses: actions/upload-artifact@master | |||
| @@ -175,6 +175,12 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream) | |||
| // Set weapon slot | |||
| if (bWeaponCorrect) | |||
| pSourcePlayer->SetWeaponSlot(uiSlot); | |||
| else | |||
| { | |||
| // remove invalid weapon data to prevent this from being relayed to other players | |||
There was a problem hiding this comment.
I think it would be nice to add a comment explaining what could cause this (Cheaters, etc).
| @@ -2443,6 +2443,10 @@ void CGame::Packet_Bulletsync(CBulletsyncPacket& Packet) | |||
| CPlayer* pPlayer = Packet.GetSourcePlayer(); | |||
| if (pPlayer && pPlayer->IsJoined()) | |||
| { | |||
| // Early return when the player attempts to fire a weapon they do not have | |||
There was a problem hiding this comment.
I think it would be nice to add a comment explaining what could cause this (Cheaters, etc).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The reasoning for both of these changes has to do with people running hacks and/or Lua injectors client sided. In cases like these (which I've verified with a client running such cheats) clients will trigger puresync packets and/or bullet sync packets for weapons the player doesn't actually have.
While the server doesn't process these puresync packets, they still relay them to other players. Meaning these weapons are visible to other players (even though according to the server the player will not have the weapons).
For the bullet sync packet the server would blindly forward them, meaning a compromised client would be able to fire any weapon, without even having that weapon.
This PR aims to add two relatively simple checks to prevent this from happening.