Adjust Hook worldobject to catch null crashes #3686
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
gmriggs
reviewed
Oct 3, 2021
| @@ -27,7 +27,7 @@ public class Hook : Container | |||
|
|
|||
| public bool HasItem => Inventory != null && Inventory.Count > 0; | |||
|
|
|||
| public WorldObject Item => Inventory != null ? Inventory.Values.FirstOrDefault() : null; | |||
| public WorldObject Item => Inventory?.Values.FirstOrDefault(); | |||
There was a problem hiding this comment.
Should not have anything related to null around it.
It is impossible for Inventory to be null
gmriggs
reviewed
Oct 3, 2021
| @@ -62,7 +62,7 @@ public override ActivationResult CheckUseRequirements(WorldObject activator) | |||
| var rootHouse = House.RootHouse; | |||
| var houseOwner = rootHouse.HouseOwner; | |||
|
|
|||
| var houseHooksVisible = rootHouse.HouseHooksVisible ?? true; | |||
| var houseHooksVisible = rootHouse?.HouseHooksVisible ?? true; | |||
There was a problem hiding this comment.
This check is pointless. The line immediately above where it says rootHouse.HouseOwner will have already crashed.
gmriggs
reviewed
Oct 3, 2021
| @@ -236,7 +236,7 @@ public void UpdateHookVisibility() | |||
| { | |||
| if (!HasItem) | |||
| { | |||
| if (!(House.HouseHooksVisible ?? false)) | |||
| if (!(House?.RootHouse?.HouseHooksVisible ?? false)) | |||
There was a problem hiding this comment.
I was okay with putting this around 1 place where the actual crash occurred, and maybe some logging to find out why that happened, and which specific house was null, however i'm not as okay with sprinkling this logic around randomly throughout the program. House and RootHouse shouldn't be null. All of this code implies that they can be null, and no explanation as to why.
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.
No description provided.