Add config to only lobotomize villagers that have been traded with#1466
Merged
Conversation
granny
requested changes
Jan 25, 2024
granny
left a comment
granny
left a comment
Member
There was a problem hiding this comment.
Merge this patch into the lobotomize patch, feel free to add yourself as a co-author.
Comment on lines
+23
to
+28
| - this.isLobotomized = !canTravelFrom(BlockPos.containing(this.position().x, this.getBoundingBox().minY + 0.0625D, this.position().z)); | ||
| + boolean canLobotomize = true; | ||
| + if(shouldCheckForTradeLocked) { | ||
| + canLobotomize = this.getVillagerXp() != 0; | ||
| + } | ||
| + this.isLobotomized = canLobotomize && !canTravelFrom(BlockPos.containing(this.position().x, this.getBoundingBox().minY + 0.0625D, this.position().z)); |
Member
There was a problem hiding this comment.
inline the canLobotomize check into the this.isLobotomized = ... line.
this.isLobotomized = (shouldCheckForTradeLocked && this.getVillagerXp() != 0) && ...
Contributor
Author
There was a problem hiding this comment.
condensed the logic, yours was a bit off when I double checked it. here's a truth table I used to check my work:
C = only lobotomize traded with
X = has no xp
E = existing lobotomize condition
F = is lobotomized
(C -> !X) ^ E
(!C v !X) ^ E
!(C ^ X) ^ E
C X E F
0 0 0 0 !(0 ^ 0) ^ 0 0
0 0 1 1 !(0 ^ 0) ^ 1 1
0 1 0 0 !(0 ^ 1) ^ 0 0
0 1 1 1 !(0 ^ 1) ^ 1 1
1 0 0 0 !(1 ^ 0) ^ 0 0
1 0 1 1 !(1 ^ 0) ^ 1 1
1 1 0 0 !(1 ^ 1) ^ 0 0
1 1 1 0 !(1 ^ 1) ^ 1 0
granny
approved these changes
Jan 25, 2024
granny
left a comment
granny
left a comment
Member
There was a problem hiding this comment.
LGTM! All that's left is creating a PR to PurpurDocs documenting the new option :) Once that's done both PRs will be merged later today (PST)
granny
added
the
needs-docs
Contributor
Author
granny
removed
the
needs-docs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Added a config (defaults to old behavior) that makes villagers only get lobotomized if they've been traded with at least once (their trades are locked).