fix PigZombieAngerEvent cancellation (fixes #5319)#5329
Merged
Conversation
Contributor
Author
|
"rebased" and retested |
chickeneer
approved these changes
Mar 19, 2021
aurorasmiles
force-pushed
the
issue-5319
branch
from
bd1ef07 to
2ffc719
Compare
MiniDigger
approved these changes
Apr 23, 2021
ExcessiveAmountsOfZombies
pushed a commit
to ExcessiveAmountsOfZombies/Paper
that referenced
this pull request
May 14, 2021
LeonTG
pushed a commit
to LeonTG/Paper
that referenced
this pull request
May 17, 2026
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
5 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.
Fixes #5319 (PigZombieAngerEvent cancellation) by setting the
PathfinderGoalHurtByTarget'sgoalTargetto null.Setting just
EntityPigZombie'sgoalTargetto null (eg. by callingpacify) is not enough: while the zombified piglin doesn't make other piglins angry, (and the piglin itself doesn't become angry either) it still attacks the player who attacked it. A piglin that attacks the player but isn't angry seems weird, so I decided not to do that. I also believe that canceling the event should mean that the piglin won't attack the player, that's another reason not to go down this route.So instead of just clearing
EntityPigZombie'sgoalTarget, I also clearedPathfinderGoalHurtByTarget'sgoalTarget. The method I added an obfhelper sets both fields to null internally. This pathfinder goal is the culprit for the weird behavior explained in the previous paragraph: even thoughEntityPigZombie'sgoalTargetwas set to null, the pathfinder goal kept setting it to the value it had internally cached. So the solution is to clear that internal cache.