Fix connector system display and map rendering bugs#8837
Merged
Conversation
- PlanetarySystem.getName(): Check if primarySlot was explicitly defined rather than checking the defaulted value. Systems without primarySlot (e.g. connector systems like TFS 31) now correctly display their system ID instead of the first planet's generic name (e.g. "U-1"). - InterstellarMapPanel: Fix NPE when rendering factions without a capital in the capitals map. Reversed the equals() call so the non-null system ID is the receiver. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes two UI/data edge cases affecting connector systems and interstellar map rendering by correcting how a system’s display name is derived when primarySlot is absent, and by preventing a null-pointer during faction-capital highlighting.
Changes:
- Update
PlanetarySystem.getName()to detect whetherprimarySlotwas explicitly provided (vs. defaulted) and fall back to system ID for connector systems. - Prevent an NPE in
InterstellarMapPanelwhen a faction has no starting planet/capital entry by making theequals()receiver non-null.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| MekHQ/src/mekhq/gui/InterstellarMapPanel.java | Avoids NPE during faction-capital rendering by reversing the equals() call. |
| MekHQ/src/mekhq/campaign/universe/PlanetarySystem.java | Corrects naming behavior for systems without an explicitly defined primarySlot by returning the system ID. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
rjhancock
approved these changes
Mar 27, 2026
This file contains hidden or 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
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.
PlanetarySystem.getName(): Check if primarySlot was explicitly defined rather than checking the defaulted value. Systems without primarySlot (e.g. connector systems like TFS 31) now correctly display their system ID instead of the first planet's generic name (e.g. "U-1").
InterstellarMapPanel: Fix NPE when rendering factions without a capital in the capitals map. Reversed the equals() call so the non-null system ID is the receiver.