Merge branch 'prevent' into 'master'

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

View File

@@ -2449,7 +2449,7 @@ public class ComputerUtilCombat {
for (final ReplacementEffect re : list) {
Map<String, String> params = re.getMapParams();
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;
}
}