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

Merge branch 'prevent' into 'master'

Browse Source 
Update check for detecting prevented damage

See merge request core-developers/forge!4742
This commit is contained in:
Michael Kamensky
2021-05-25 06:21:23 +00:00
parent 532e6bee5b f374466d0a
commit d1e8f9db6b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
View File

@@ -2449,7 +2449,7 @@ public class ComputerUtilCombat {
for (final ReplacementEffect re : list) { for (final ReplacementEffect re : list) {
Map<String, String> params = re.getMapParams(); Map<String, String> params = re.getMapParams();
if (params.containsKey("Prevent") || if (params.containsKey("Prevent") ||
(re.getOverridingAbility() != null && re.getOverridingAbility().getApi() != ApiType.ReplaceDamage)) { (re.getOverridingAbility() != null && re.getOverridingAbility().getApi() != ApiType.ReplaceDamage && re.getOverridingAbility().getApi() != ApiType.ReplaceEffect)) {
return true; return true;
} }
} }