From 68a934e644523d4423cd998a7c340736e89fdf83 Mon Sep 17 00:00:00 2001 From: kuronekochomusuke Date: Wed, 19 Jul 2023 18:23:59 -0400 Subject: [PATCH] clear calcDmgPerHitReport once it is added to vPhaseReport --- megamek/src/megamek/common/weapons/ACAPHandler.java | 1 + megamek/src/megamek/common/weapons/MGAWeaponHandler.java | 1 + megamek/src/megamek/common/weapons/RifleWeaponHandler.java | 1 + megamek/src/megamek/common/weapons/SRMTandemChargeHandler.java | 1 + megamek/src/megamek/common/weapons/WeaponHandler.java | 1 + 5 files changed, 5 insertions(+) diff --git a/megamek/src/megamek/common/weapons/ACAPHandler.java b/megamek/src/megamek/common/weapons/ACAPHandler.java index baa2e62e075..9e40b977f3b 100644 --- a/megamek/src/megamek/common/weapons/ACAPHandler.java +++ b/megamek/src/megamek/common/weapons/ACAPHandler.java @@ -75,6 +75,7 @@ protected void handleEntityDamage(Entity entityTarget, Vector vPhaseRepo // Report calcDmgPerHitReports here if (!calcDmgPerHitReport.isEmpty()) { vPhaseReport.addAll(calcDmgPerHitReport); + calcDmgPerHitReport.clear(); } // if the target was in partial cover, then we already handled diff --git a/megamek/src/megamek/common/weapons/MGAWeaponHandler.java b/megamek/src/megamek/common/weapons/MGAWeaponHandler.java index 14f275e8d05..53aae0ba393 100644 --- a/megamek/src/megamek/common/weapons/MGAWeaponHandler.java +++ b/megamek/src/megamek/common/weapons/MGAWeaponHandler.java @@ -171,6 +171,7 @@ protected void handleEntityDamage(Entity entityTarget, // Report calcDmgPerHitReports here if (!calcDmgPerHitReport.isEmpty()) { vPhaseReport.addAll(calcDmgPerHitReport); + calcDmgPerHitReport.clear(); } // if the target was in partial cover, then we already handled diff --git a/megamek/src/megamek/common/weapons/RifleWeaponHandler.java b/megamek/src/megamek/common/weapons/RifleWeaponHandler.java index bb95ca5bfa4..1b3821aeb65 100644 --- a/megamek/src/megamek/common/weapons/RifleWeaponHandler.java +++ b/megamek/src/megamek/common/weapons/RifleWeaponHandler.java @@ -137,6 +137,7 @@ protected void handleEntityDamage(Entity entityTarget, // Report calcDmgPerHitReports here if (!calcDmgPerHitReport.isEmpty()) { vPhaseReport.addAll(calcDmgPerHitReport); + calcDmgPerHitReport.clear(); } // if the target was in partial cover, then we already handled diff --git a/megamek/src/megamek/common/weapons/SRMTandemChargeHandler.java b/megamek/src/megamek/common/weapons/SRMTandemChargeHandler.java index 82c8c18ec91..d4f1509e162 100644 --- a/megamek/src/megamek/common/weapons/SRMTandemChargeHandler.java +++ b/megamek/src/megamek/common/weapons/SRMTandemChargeHandler.java @@ -82,6 +82,7 @@ protected void handleEntityDamage(Entity entityTarget, // Report calcDmgPerHitReports here if (!calcDmgPerHitReport.isEmpty()) { vPhaseReport.addAll(calcDmgPerHitReport); + calcDmgPerHitReport.clear(); } // if the target was in partial cover, then we already handled diff --git a/megamek/src/megamek/common/weapons/WeaponHandler.java b/megamek/src/megamek/common/weapons/WeaponHandler.java index 4e5795bf8e4..835810130c1 100644 --- a/megamek/src/megamek/common/weapons/WeaponHandler.java +++ b/megamek/src/megamek/common/weapons/WeaponHandler.java @@ -1499,6 +1499,7 @@ protected void handleEntityDamage(Entity entityTarget, // Report calcDmgPerHitReports here if (!calcDmgPerHitReport.isEmpty()) { vPhaseReport.addAll(calcDmgPerHitReport); + calcDmgPerHitReport.clear(); } // if the target was in partial cover, then we already handled