-
-
Notifications
You must be signed in to change notification settings - Fork 226
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
Allow fluids to flow between claims of the same owner #1218
Conversation
This comment has been minimized.
This comment has been minimized.
This would be super helpful. Please merge if possible. |
This looks great i don't get it why they didn't review it yet. |
29c51a5
to
42e7b84
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think my one reservation is stuff like shop or display areas - someone filling their allotted subclaim with lava could grief adjacent decorations, or vice versa with restricted subclaims. Some of that is down to intelligent design for claim owners, but if we're introducing a new behavior, they can't really be expected to have planned around it. I guess GP could leave this to an addon, but it makes me a bit uncomfortable.
d75fe4d
to
c7348c5
Compare
@Jikoo sorry for a late reply: I've added a check for subdivisions, it now behaves exactly as 16.18.1 with regard to them: Does this address your concerns? |
I also think a restricted subclaim should block flow from its parent because the list of people with build trust inside it has no relation to the list of people who have build trust in the claim as a whole. Otherwise yes, looks good! |
and refactor the logic for checking whether fluid flow is allowed between two claims
@Jikoo started adding a check for the restricted subclaims and the code became a bit too hard to follow, so I've ended up refactoring it a bit. Re-did the test with subclaims added to the mix: Let me know if have any feedback on this! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks excellent to me 👍 Sorry for asking for such a logical mess
No problem at all! I think the implementation we ended up with here is much cleaner than what I initially proposed! |
Context: https://korobi.vq.lc/network/spigot/channel/griefprevention/logs/2020/11/19/#L14
Tested combinations:
Each 10x10 square is a claim, color denotes the owner: green is wilderness, red is Player 1, yellow is Player 2, black is admin claim, white squares inside claims are subdivisions; sea lantern is where the water source block is.