fix: InputSystem#getInputsForBindButton was throwing NPE #4256
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
skaldarnar
commented
Nov 20, 2020
| * | ||
| * @param bindId the ID. | ||
| * @return a list of keyboard/mouse inputs that trigger the binding. | ||
| */ | ||
| public List<Input> getInputsForBindButton(SimpleUri bindId) { | ||
| return bindsSubsystem.getInputsForBindButton(bindId); | ||
| return bindsManager.getBindsConfig().getBinds(bindId); |
There was a problem hiding this comment.
This is the actual bug fix, all other changes are just IntelliJ's formatting...
skaldarnar
commented
Nov 20, 2020
| @@ -78,9 +77,6 @@ | |||
| @In | |||
| private CameraTargetSystem targetSystem; | |||
|
|
|||
| @In | |||
| private BindsSubsystem bindsSubsystem; | |||
There was a problem hiding this comment.
The bindsSubsystem was null here anyways, and the only place this was used could easily be replaced with access to the super interface of BindsManager.
This was referenced Nov 20, 2020
jdrueckert
approved these changes
Nov 21, 2020
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.
I think the only usage of that API wrapper method (in Omega) is in Dialogs where it is used to get the associated bind for an action to display it as a hint to the user.
https://github.com/Terasology/Dialogs/blob/5a0073966afc66f18bc1d7220c7b49c8c053d9c2/src/main/java/org/terasology/dialogs/DialogSystem.java#L190
This was throwing a NPE for a while, resulting in the hint not showing up. This PR fixes that.