Avoid exceptions using lives on non-blitz matches

Signed-off-by: Pablo Herrera <[email protected]>
PGMDev · Oct 28, 2024 · c06af49 · c06af49
1 parent 80e5c27
commit c06af49
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/src/main/java/tc/oc/pgm/variables/types/LivesVariable.java b/core/src/main/java/tc/oc/pgm/variables/types/LivesVariable.java
@@ -12,11 +12,15 @@ public LivesVariable() {
 
   @Override
   protected double getValueImpl(MatchPlayer player) {
-    return player.moduleRequire(BlitzMatchModule.class).getNumOfLives(player.getId());
+    return player
+        .moduleOptional(BlitzMatchModule.class)
+        .map(bmm -> bmm.getNumOfLives(player.getId()))
+        .orElse(-1);
   }
 
   @Override
   protected void setValueImpl(MatchPlayer player, double value) {
-    player.moduleRequire(BlitzMatchModule.class).setLives(player, Math.max((int) value, 0));
+    int amt = Math.max((int) value, 0);
+    player.moduleOptional(BlitzMatchModule.class).ifPresent(bmm -> bmm.setLives(player, amt));
   }
 }