From aba305a24f83f7fe3f33152696d43a0a9e2c8248 Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 21 Sep 2017 18:17:36 +0000 Subject: [PATCH] - Moved the code fragment a bit. git-svn-id: http://svn.slightlymagic.net/forge/trunk@35702 269b9781-a132-4a9b-9d4e-f004f1b56b58 --- .../main/java/forge/game/replacement/ReplaceDamage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java b/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java index f7b6a5ad..f2ae6bd6 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java @@ -67,6 +67,10 @@ public class ReplaceDamage extends ReplacementEffect { return false; } } + if (((Integer) runParams.get("DamageAmount")) == 0) { + // If no actual damage is dealt, there is nothing to replace + return false; + } if (hasParam("DamageAmount")) { String full = getParam("DamageAmount"); String operator = full.substring(0, 2); @@ -82,10 +86,6 @@ public class ReplaceDamage extends ReplacementEffect { return false; } } - if (((Integer) runParams.get("DamageAmount")) == 0) { - // If no actual damage is dealt, there is nothing to replace - return false; - } if (hasParam("IsCombat")) { if (getParam("IsCombat").equals("True")) { if (!((Boolean) runParams.get("IsCombat"))) {