From bbe8d79400abcb3343a78093d5ce4cb35d7e21ab Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Fri, 11 Jan 2019 10:16:29 +0000 Subject: [PATCH] Player: add PayLife Trigger --- .../src/main/java/forge/game/player/Player.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index cf3843b7b20..e5ef2e486b6 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -515,14 +515,15 @@ public class Player extends GameEntity implements Comparable { return false; } - if (lifePayment <= 0) - return true; + loseLife(lifePayment); - // rule 118.8 - if (life >= lifePayment) { - return (loseLife(lifePayment) > 0); - } - return false; + // Run triggers + final Map runParams = Maps.newHashMap(); + runParams.put("Player", this); + runParams.put("LifeAmount", lifePayment); + game.getTriggerHandler().runTrigger(TriggerType.PayLife, runParams, false); + + return true; } public final boolean canPayEnergy(final int energyPayment) {