fix(port): Do not move into monsters that we cannot displace #4325
Conversation
This file contains 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
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.
Purpose of change
Porting fix from cdda, original PR: CleverRaven/Cataclysm-DDA#47717
Issue is when player tries to move into a spot where a pet is and displace it but the originating position is not a position that the pet can move to. e.g. if you move from chicken fence to tile in the coop containing a pet chicken.
Describe the solution
check result of critter.move_to() before actually moving player and making them disappear under the same tile as chicken. In that case we return the original position of player back so they dont move.
Describe alternatives you've considered
Testing
character climbs chicken fence. tries to move to tile with friendly chicken. with this patch, that should fail and you get proper error message. without the patch, character disappears under chicken which can then lead to crashes if there's another chicken in the next tile you try to to move to etc.
Additional context
Checklist