fix: prevent npe on player death by thrown spear #254
Merged
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
Combat system may assign `null` as instigator to some (Before)DestroyEvents which causes an NPE in the player death system. This fixes the crash with a `TODO` item to find and fix the root cause. See Terasology/CombatSystem#92 for first investigation results. In addition, this commit introduces an enum for the statistics type to update to avoid any bugs resulting from using plain string "constants" (we did not even use constants ...).
This should make it easier to find this value and adjust it later, e.g., for local testing or tweaking.
jdrueckert
reviewed
Dec 4, 2021
Comment on lines
+29
to
+30
| private static final int COUNTDOWN_IN_SECONDS = 30; | ||
|
|
There was a problem hiding this comment.
Should this reside with the other LAS constants in LASUtils?
| * @param aliveCharacterComponent | ||
| * @param event notification event that a player entity is about to be destroyed (usually sent on death) | ||
| * @param player the player entity about to be destroyed | ||
| * @param characterComponent ensures that the entity has a character (TODO: why do we need this?) |
There was a problem hiding this comment.
To make sure we only fetch this event for actual players? 🤔
As we only do something here if PlayerCharacterComponent is present, maybe we want to "require" that one instead.
src/main/java/org/terasology/module/lightandshadow/systems/PlayerDeathSystem.java
Outdated
Show resolved
Hide resolved
jdrueckert
previously approved these changes
Dec 4, 2021
jdrueckert
approved these changes
Dec 4, 2021
jdrueckert
changed the title
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.
Combat system may assign
nullas instigator to some (Before)DestroyEvents which causes an NPE in the player death system.This fixes the crash with a
TODOitem to find and fix the root cause. See Terasology/CombatSystem#92 for first investigation results.In addition, this commit introduces an enum for the statistics type to update to avoid any bugs resulting from using plain string "constants" (we did not even use constants ...).
Furthermore, I've made the pre-game countdown a constant. This should make it easier to find this value and adjust it later, e.g., for local testing or tweaking.