Fix for non-bullet guns returned as 0 in weapon data #1046
Merged
Conversation
This file contains 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
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.
This pretty simply fixes an issue described in #1008 by removing the whole check which was the cause of a problem with GetPlayerWeaponData, when player got some non-bullet (e.g. melee, gift or special weapons) with 0 ammo and it still was in his hands, but after switching weapons back and forth, GetPlayerWeaponData has suddenly start returning 0 as weaponid in its slot which is wrong.
A bit more complicated solution with keeping the initial point of this check would be to add the extra condition like "do the clearing of both weapon and ammo in the slot only if this type of weapon (generally) has ammo but now a player has it 0". After some time of thinking I consider this whole check not so crucial (an "issue" it's aimed to fix doesn't even seem as a real one for me), so I decided to fix it with this way provided, just by removing it completely.