Don't shatter non-existent string when defeated #1804
Merged
Conversation
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
Since 494fec1 ("Player Hook: Shatter string when player is defeated"), the player's mode changing to DEFEATED causes a call to PlayerHook.shatter_string(). If the player was not currently throwing a string - for example, if they were caught by a guard or by the void while not grappling - this would crash: SCRIPT ERROR: Invalid access to property or key 'points' on a base object of type 'Nil'. at: PlayerHook.tessellate_string (res://scenes/game_elements/characters/player/components/player_hook.gd:213) GDScript backtrace (most recent call first): [0] tessellate_string (res://scenes/game_elements/characters/player/components/player_hook.gd:213) [1] shatter_string (res://scenes/game_elements/characters/player/components/player_hook.gd:220) [2] _on_player_mode_changed (res://scenes/game_elements/characters/player/components/player_hook.gd:109) [3] _set_mode (res://scenes/game_elements/characters/player/components/player.gd:111) [4] defeat (res://scenes/game_elements/characters/player/components/player.gd:242) [5] _on_player_detected (res://scenes/game_logic/stealth_game_logic.gd:16) [6] _update_player_awareness (res://scenes/game_elements/characters/enemies/guard/components/guard.gd:204) [7] _process (res://scenes/game_elements/characters/enemies/guard/components/guard.gd:165) Add a check in the mode_changed callback: only call shatter_string() if there is a string to shatter. Fixes #1798
|
Play this branch at https://play.threadbare.game/branches/endlessm/wjt/don-t-shatter-non-existent-string-when-defeated. (This launches the game from the start, not directly at the change(s) in this pull request.) |
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.
Since 494fec1 ("Player Hook: Shatter string when player is defeated"), the player's mode changing to DEFEATED causes a call to PlayerHook.shatter_string(). If the player was not currently throwing a string - for example, if they were caught by a guard or by the void while not grappling - this would crash:
Add a check in the mode_changed callback: only call shatter_string() if there is a string to shatter.
Fixes #1798