Skip to content
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

Armor rework, part 1b #1412

Merged
merged 3 commits into from
Feb 4, 2024
Merged

Armor rework, part 1b #1412

merged 3 commits into from
Feb 4, 2024

Conversation

neoancient
Copy link
Member

MML part of MegaMek/megamek#5116

if (armor != null) {
critLabel.setText(formatCrits(armor.getCriticals(entity)));
}
critLabel.setText(formatCrits(armor.getCriticals(entity)));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

armor can't be null any more?

@HammerGS
Copy link
Member

HammerGS commented Feb 4, 2024

Without thinking I merged the MekHQ one of these. Rather than revert, I'll merge this and let @neoancient address the comment.

@HammerGS HammerGS merged commit 9261057 into master Feb 4, 2024
2 of 4 checks passed
HammerGS added a commit that referenced this pull request Feb 4, 2024
Armor rework, part 1b #1412
@pavelbraginskiy
Copy link
Member

ArmorType.forEntity can never return null in its current implementation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants