External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Voice of Resurgence

Browse source
This commit is contained in:
Noah Gleason 2018-06-24 16:55:15 -04:00
parent 6a2ad691d4
commit 37e800a7dd
No known key found for this signature in database
GPG key ID: EC030EC6B0650A40
3 changed files with 43 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java
View file

@ -48,6 +48,8 @@ public class ConditionalTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkInterveningIfClause(Game game) {
System.out.println("Source ID: "+this.getControllerId());
System.out.println("Active player ID: "+game.getActivePlayerId());
return condition.apply(game, this);
}

25
Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java
View file

@ -38,7 +38,10 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl {
public OrTriggeredAbility(OrTriggeredAbility ability) {
super(ability);
this.triggeredAbilities = ability.triggeredAbilities;
this.triggeredAbilities = new TriggeredAbility[ability.triggeredAbilities.length];
for (int i = 0; i < this.triggeredAbilities.length; i++){
this.triggeredAbilities[i] = ability.triggeredAbilities[i].copy();
}
this.ruleTrigger = ability.ruleTrigger;
}
@ -122,4 +125,24 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl {
ability.setSourceObject(sourceObject, game);
}
}
@Override
public boolean checkInterveningIfClause(Game game) {
for (TriggeredAbility ability : triggeredAbilities) {
if (!ability.checkInterveningIfClause(game)){
return false;
}
}
return true;
}
@Override
public boolean checkIfClause(Game game) {
for (TriggeredAbility ability : triggeredAbilities) {
if (!ability.checkIfClause(game)){
return false;
}
}
return true;
}
}