external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed Replacement Effects

Browse Source
This commit is contained in:
Hanmac
2016-12-28 15:01:33 +00:00
parent 3629be1a38
commit 08a2b54e76
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/ability/effects/ReplaceEffect.java
View File

@@ -37,6 +37,7 @@ public class ReplaceEffect extends SpellAbilityEffect {
} }
// effect was updated // effect was updated
originalParams.put("ReplacementResult", ReplacementResult.Updated); originalParams.put("ReplacementResult", ReplacementResult.Updated);
break;
} }
default: default:
// effect was replaced with something else // effect was replaced with something else

1
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -410,6 +410,7 @@ public class Player extends GameEntity implements Comparable<Player> {
} else { } else {
return false; return false;
} }
break;
default: default:
return false; return false;
} }

2
forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java
View File

@@ -43,7 +43,7 @@ public class ReplaceGainLife extends ReplacementEffect {
*/ */
@Override @Override
public boolean canReplace(Map<String, Object> runParams) { public boolean canReplace(Map<String, Object> runParams) {
if (!runParams.get("Event").equals("GainLife") && (int)runParams.get("LifeGained") <= 0) { if (!runParams.get("Event").equals("GainLife") || ((int)runParams.get("LifeGained")) <= 0) {
return false; return false;
} }
if (this.getMapParams().containsKey("ValidPlayer")) { if (this.getMapParams().containsKey("ValidPlayer")) {