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

Fix #4790: uncaught NPE when Sniper Turret fired on fleeing off-board target #4804

Merged
merged 2 commits into from
Sep 27, 2023
Merged

Fix #4790: uncaught NPE when Sniper Turret fired on fleeing off-board target #4804

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
679cdeb
Fix #4790: uncaught NPE when Sniper Turret fired on fleeing off-board…
Sleet01 Sep 25, 2023
a4109f8
Simplify handling of missing off-board target entity
Sleet01 Sep 26, 2023
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
11 changes: 10 additions & 1 deletion megamek/src/megamek/common/weapons/ArtilleryWeaponIndirectFireHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,16 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
}

final Vector<Integer> spottersBefore = aaa.getSpotterIds();
Coords targetPos = target.getPosition();

// Handle counter-battery on fleeing/fled off-board targets.
Coords targetPos;
try {
targetPos = target.getPosition();
Sleet01 marked this conversation as resolved.
Show resolved Hide resolved
} catch (Exception e) {
LogManager.getLogger().error(String.format("Artillery Target %s is missing; off-board target fled?", waa.getTargetId()));
return false;
}

final int playerId = aaa.getPlayerId();
boolean targetIsEntity = target.getTargetType() == Targetable.TYPE_ENTITY;
boolean targetIsAirborneVTOL = targetIsEntity && target.isAirborneVTOLorWIGE();
Expand Down