Fix failing status in multiplayer not accounting for Easy mod lives

osudroid · Dec 25, 2023 · 426e426 · 426e426
1 parent 66cb7cc
commit 426e426
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/ru/nsu/ccfit/zuev/osu/scoring/StatisticV2.java b/src/ru/nsu/ccfit/zuev/osu/scoring/StatisticV2.java
@@ -84,6 +84,8 @@ public class StatisticV2 implements Serializable {
      */
     private float modScoreMultiplier = 1;
 
+    private int life = 1;
+
 
     public StatisticV2() {
         playerName = null;
@@ -113,6 +115,10 @@ public StatisticV2(final Statistic stat) {
         hp = stat.hp;
         diffModifier = stat.diffModifier;
         mod = stat.mod.clone();
+        if (stat.mod.contains(GameMod.MOD_EASY)) {
+            life = 3;
+        }
+
         setPlayerName(Config.getLocalUsername());
         computeModScoreMultiplier();
     }
@@ -152,7 +158,9 @@ public void changeHp(final float amount) {
         hp += amount;
         if (hp < 0) {
             hp = 0;
-            if (canFail) {
+            life = Math.max(0, life - 1);
+
+            if (canFail && life == 0) {
                 isAlive = false;
             }
         }
@@ -559,6 +567,7 @@ public void setModFromString(String s) {
                     break;
                 case 'e':
                     mod.add(GameMod.MOD_EASY);
+                    life = 3;
                     break;
                 case 'n':
                     mod.add(GameMod.MOD_NOFAIL);