github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-02 03:18:09 -09:00
Code Issues Projects Releases Packages Wiki Activity

Implemented Johan

Browse source
This commit is contained in:
Zzooouhh 2017-10-24 06:12:10 +02:00 • committed by GitHub
parent 7c5562881b
commit e82d640060
1 changed files with 2 additions and 1 deletions

3
Mage/src/main/java/mage/game/combat/Combat.java
View file

@ -33,6 +33,7 @@ import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.RequirementEffect;
import mage.abilities.effects.RestrictionEffect;
import mage.abilities.keyword.JohanVigilanceAbility;
import mage.abilities.keyword.VigilanceAbility;
import mage.constants.Outcome;
import mage.constants.Zone;
@ -1091,7 +1092,7 @@ public class Combat implements Serializable, Copyable<Combat> {
@SuppressWarnings("deprecation")
public boolean declareAttacker(UUID creatureId, UUID defenderId, UUID playerId, Game game) {
Permanent attacker = game.getPermanent(creatureId);
if (!attacker.getAbilities().containsKey(VigilanceAbility.getInstance().getId())) {
if (!attacker.getAbilities().containsKey(VigilanceAbility.getInstance().getId()) && !attacker.getAbilities().containsKey(JohanVigilanceAbility.getInstance().getId())) {
if (!attacker.isTapped()) {
attacker.setTapped(true);
attackersTappedByAttack.add(attacker.getId());