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 Tameable protections #2131

Merged

Conversation

Jikoo
Copy link
Collaborator

@Jikoo Jikoo commented Aug 8, 2023

  • Fix PVP worlds not respecting claims
  • Fix wolves being protected when not tamed

Closes #2128
Closes #1679

@Jikoo
Copy link
Collaborator Author

Jikoo commented Aug 8, 2023

Actually a bit messier than I thought, realized while testing something else that the fallthrough to default causes non-wolf pets to always be protected outside of claims. This does fix cases where animals should be protected but aren't, but it doesn't fix some cases where they shouldn't be. Going to end up with some duplicate lines unfortunately, but there's not a lot that can be done about that without mixing a bunch of PVP logic into non-PVP code.

@Jikoo Jikoo marked this pull request as draft August 8, 2023 16:17
@Jikoo Jikoo marked this pull request as ready for review August 8, 2023 16:33
@Jikoo
Copy link
Collaborator Author

Jikoo commented Aug 8, 2023

Closes #1679

/e: Oh, I guess that doesn't update the linked issues, gotta edit OP

@RoboMWM RoboMWM merged commit 8f3f249 into GriefPrevention:master Aug 8, 2023
1 check passed
@Jikoo Jikoo deleted the dev/fix-tamed-animal-protection branch August 8, 2023 20:51
@Jikoo Jikoo mentioned this pull request Jan 10, 2024
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.

Damage to tamed animals v16.18.2-beta1 Pets protected outside of claims
2 participants