-
Notifications
You must be signed in to change notification settings - Fork 286
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fighter squadron refactor #3006
Merged
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
NickAragua
requested review from
sixlettervariables,
neoancient and
Windchild292
July 12, 2021 20:44
Windchild292
approved these changes
Jul 12, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, just some formatting quips.
if(te.getActiveSubEntities().orElse(Collections.emptyList()).isEmpty()) { | ||
List<Entity> fighters = te.getActiveSubEntities(); | ||
|
||
if(fighters.isEmpty()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
if(fighters.isEmpty()) { | |
if (fighters.isEmpty()) { |
Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com>
Co-authored-by: Justin Bowen <39067288+Windchild292@users.noreply.github.com>
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.
There are two components to this set of changes. One is the removal of the unnecessary and burdensome "Optional" in Entity.getSubEntities(). I like syntactic sugar as much as the next guy, but only if it actually reduces code volume or provides some other return on investment.
The second component is that all interactions within FighterSquadron that used the "fighters" list directly now use the getSubEntities() or getActiveSubEntities() methods instead, guaranteeing that the entities in question are never null, which is what caused #2988, #2989.