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

Fix OrTriggeredAbility hang

Browse source
This commit is contained in:
Noah Gleason 2018-06-24 13:51:02 -04:00
parent 6ee4d4a217
commit 6a2ad691d4
No known key found for this signature in database
GPG key ID: EC030EC6B0650A40
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,23 +45,25 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
boolean toRet = false;
for (TriggeredAbility ability : triggeredAbilities) {
toRet = toRet || ability.checkEventType(event, game);
if (ability.checkEventType(event, game)){
System.out.println("Correct event type (" + event.getType() + ")");
return true;
}
}
if (toRet) {
System.out.println("Correct event type (" + event.getType() + ")");
}
return toRet;
return false;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
boolean toRet = false;
for (TriggeredAbility ability : triggeredAbilities) {
toRet = toRet || ability.checkTrigger(event, game);
if (ability.checkEventType(event, game) && ability.checkTrigger(event, game)){
System.out.println("Triggered from "+ability.getRule());
return true;
}
System.out.println("Checked "+ability.getRule());
}
return toRet;
return false;
}
@Override