Merge pull request #4713 from NickAragua/fix_swarm_attack_stop_npe

fix #4346
MegaMek · Aug 18, 2023 · a0b3729 · a0b3729
2 parents 2af5a9d + e6a353a
commit a0b3729
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/megamek/src/megamek/common/weapons/StopSwarmAttackHandler.java b/megamek/src/megamek/common/weapons/StopSwarmAttackHandler.java
@@ -64,7 +64,10 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
  // Only apply the "stop swarm 'attack'" to the swarmed Mek.
  if (ae.getSwarmTargetId() != target.getId()) {
  Entity other = game.getEntity(ae.getSwarmTargetId());
- other.setSwarmAttackerId(Entity.NONE);
+
+ if (other != null) {
+ other.setSwarmAttackerId(Entity.NONE);
+ }
  } else {
  entityTarget.setSwarmAttackerId(Entity.NONE);
  }