Skip to content
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.

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

Prevent switching to weapon while carrying fuel nozzle #4629

Merged
merged 2 commits into from
Nov 12, 2016

Conversation

jonpas
Copy link
Member

@jonpas jonpas commented Nov 2, 2016

When merged this pull request will:

Refuel should use a canInteractWith (like carrying does), but that will need a bigger rework. Because of it not using canInteractWith Advanced Throwing is possible while carrying a fuel nozzle or jerry can.

Aditionally vanilla throwing is possible both with refuel and carrying, a setAmmo framework for that would be nice, but have no time to work on it at the moment.

@jonpas jonpas added kind/bug-fix Release Notes: **FIXED:** status/cherrypick labels Nov 2, 2016
@jonpas jonpas added this to the 3.8.2 milestone Nov 2, 2016
@commy2
Copy link
Contributor

commy2 commented Nov 2, 2016

lgtm, but why is FUNC(statusEffect_set) not part of FUNC(dropNozzle) but called afterwards?

@jonpas
Copy link
Member Author

jonpas commented Nov 2, 2016

I don't know, it's used like that in other refuel places.

@PabstMirror
Copy link
Contributor

@jonpas - I just flipped the PFEH exitWith condition if you want to double check, otherwise looks good to go.

@jonpas jonpas merged commit d69b48b into master Nov 12, 2016
@jonpas jonpas deleted the fixRefuelShooting branch November 12, 2016 23:13
@jonpas
Copy link
Member Author

jonpas commented Nov 12, 2016

Nice catch @PabstMirror !

@thojkooi
Copy link
Contributor

Added to 3.8.2 branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants