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

fix: prevent bullet from killing shooter. #725

Merged
merged 1 commit into from Mar 16, 2023
Merged

Conversation

iwek7
Copy link
Contributor

@iwek7 iwek7 commented Mar 16, 2023

This fixes #715. Issue suggested that what should be done is adding owner to damage region (as is done in case of sword), however it seems that bullet does not use those regions so I simply add entity marker to bullet object and filter out all collisions with this entity.

Copy link
Member

@zicklag zicklag left a comment

Choose a reason for hiding this comment

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

Awesome, thanks! Just one clippy lint to fix.

And please run cargo fmt, too.

core/src/elements/musket.rs Outdated Show resolved Hide resolved
@zicklag zicklag enabled auto-merge March 16, 2023 22:02
@zicklag zicklag changed the title fix: prevent bullet from killing shooter (#715) fix: prevent bullet from killing shooter. Mar 16, 2023
@zicklag zicklag added this pull request to the merge queue Mar 16, 2023
Merged via the queue into fishfolk:main with commit bc0e0dd Mar 16, 2023
8 checks passed
@iwek7 iwek7 deleted the bug/715 branch March 17, 2023 06:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Don't Let The Musket Bullet Kill the Player That Shot It
2 participants