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.

Sign up for GitHub

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

Jump to bottom

Interaction - Check canInteractWith before taking dropped weapons #9783

Merged
merged 2 commits into from
Apr 1, 2024
Merged

Interaction - Check canInteractWith before taking dropped weapons #9783

merged 2 commits into from
Apr 1, 2024

Conversation

PabstMirror
Copy link
Contributor

20240207195944_1

@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Feb 8, 2024
@LinkIsGrim
Copy link
Contributor

:(

@johnb432
Copy link
Contributor

Do we also want to lock the inventory while carrying?
It would mean that we would also need to handle edge cases liking players dying/disconnecting etc.

@PabstMirror PabstMirror modified the milestones: 3.17.0, Ongoing Mar 28, 2024
@PabstMirror PabstMirror changed the title Interaction - Block interaction on carried ground weapon holders Interaction - Check canInteractWith before taking dropped weapons Apr 1, 2024
@PabstMirror
Copy link
Contributor Author

I guess this is desired behavior
but we should still check canInteractWith to prevent handcuffed or otherwise locked players from using this
(this checks canInteractWith with objNull as target so it won't check if claimed)

johnb432
johnb432 approved these changes Apr 1, 2024
View reviewed changes
Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@LinkIsGrim LinkIsGrim modified the milestones: Ongoing, 3.17.0 Apr 1, 2024
@LinkIsGrim LinkIsGrim merged commit 0c589c2 into master Apr 1, 2024
5 checks passed
@LinkIsGrim LinkIsGrim deleted the carryWeaponLock branch April 1, 2024 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LinkIsGrim LinkIsGrim LinkIsGrim approved these changes

@johnb432 johnb432 johnb432 approved these changes

Assignees
No one assigned
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Milestone
3.17.0
Development

Successfully merging this pull request may close these issues.
3 participants
@PabstMirror @LinkIsGrim @johnb432