External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fixed #8916

Browse source
This commit is contained in:
Jeff Wadsworth 2022-06-24 15:31:35 -05:00
parent 227ae8c2e2
commit 48a96e5e8f
95 changed files with 260 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/cards/CardImpl.java
View file

@ -8,7 +8,6 @@ import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.continuous.HasSubtypesSourceEffect;
import mage.abilities.keyword.ChangelingAbility;
import mage.abilities.keyword.FlashbackAbility;
import mage.abilities.keyword.ReconfigureAbility;
import mage.abilities.mana.ActivatedManaAbilityImpl;
import mage.cards.repository.PluginClassloaderRegistery;
import mage.constants.*;
@ -31,6 +30,7 @@ import org.apache.log4j.Logger;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import mage.abilities.keyword.ReconfigureAbility;
public abstract class CardImpl extends MageObjectImpl implements Card {
@ -821,9 +821,8 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
return false;
}
if (attachment.hasSubtype(SubType.EQUIPMENT, game)
&& (attachment.isCreature(game)
&& !attachment.getAbilities(game).containsClass(ReconfigureAbility.class)
|| !this.isCreature(game))) {
&& (attachment.isCreature(game) // seems strange and perhaps someone knows why this is checked.
&& !attachment.getAbilities(game).containsClass(ReconfigureAbility.class))) {
return false;
}
if (attachment.hasSubtype(SubType.FORTIFICATION, game)

10
Mage/src/main/java/mage/game/events/DamagedBatchEvent.java
View file

@ -40,6 +40,16 @@ public abstract class DamagedBatchEvent extends GameEvent {
.orElse(null);
}
@Override
public UUID getSourceId() {
return events
.stream()
.map(GameEvent::getSourceId)
.filter(Objects::nonNull)
.findFirst()
.orElse(null);
}
public void addEvent(DamagedEvent event) {
this.events.add(event);
}