External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Tinder Wall - Fixed it's damage dealing ability always fizzles (fixes #5005).

Browse source
This commit is contained in:
LevelX2 2018-06-19 17:35:53 +02:00
parent 45d5baed60
commit 74b126c940
3 changed files with 50 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/main/java/mage/filter/predicate/permanent/BlockedByIdPredicate.java
View file

@ -1,4 +1,3 @@
package mage.filter.predicate.permanent;
import java.util.UUID;
@ -6,6 +5,7 @@ import mage.filter.predicate.Predicate;
import mage.game.Game;
import mage.game.combat.CombatGroup;
import mage.game.permanent.Permanent;
import mage.watchers.common.BlockedAttackerWatcher;
/**
*
@ -25,6 +25,13 @@ public class BlockedByIdPredicate implements Predicate<Permanent> {
if (combatGroup.getBlockers().contains(blockerId) && combatGroup.getAttackers().contains(input.getId())) {
return true;
}
} // Check if the blockerId was blocked before, if it does no longer exists now but so the target attacking is still valid
Permanent blocker = game.getPermanentOrLKIBattlefield(blockerId);
if (blocker != null) {
BlockedAttackerWatcher watcher = (BlockedAttackerWatcher) game.getState().getWatchers().get(BlockedAttackerWatcher.class.getSimpleName());
if (watcher != null) {
return watcher.creatureHasBlockedAttacker(input, blocker, game);
}
}
return false;
}