clear calcDmgPerHitReport once it is added to vPhaseReport

MegaMek · Jul 19, 2023 · 68a934e · 68a934e
1 parent 2513dd4
commit 68a934e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git 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<Report> 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
@@ -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
@@ -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
@@ -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
@@ -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