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.

Sign up for GitHub

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

Potential fix for this issue by allowing isEligibleFor to proceed if … #2558

Merged
merged 3 commits into from
Mar 26, 2021
Merged

Potential fix for this issue by allowing isEligibleFor to proceed if … #2558

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc0b422
Potential fix for this issue by allowing isEligibleFor to proceed if …
TenkawaBC Jan 8, 2021
811c139
Update megamek/src/megamek/common/Entity.java
TenkawaBC Jan 8, 2021
4766f6a
Update megamek/src/megamek/common/Entity.java
TenkawaBC Jan 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion megamek/src/megamek/common/Entity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9761,7 +9761,12 @@ public int getKillerId() {
public boolean isEligibleFor(IGame.Phase phase) {
// only deploy in deployment phase
if ((phase == IGame.Phase.PHASE_DEPLOYMENT) == isDeployed()) {
return false;
if ((isDeployed() == false) && isEligibleForTargetingPhase() && game.getOptions().booleanOption(
OptionsConstants.ADVCOMBAT_ON_MAP_PREDESIGNATE)) {
TenkawaBC marked this conversation as resolved.
Show resolved Hide resolved
MegaMek.getLogger().info("Artillery Units Present and Advanced PreDesignate option enabled");
TenkawaBC marked this conversation as resolved.
Show resolved Hide resolved
} else {
return false;
}
}

// carcass can't do anything
Expand Down