Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

-don't static import static filters

Browse source 
-use existing choose color and gain protection from color attached effects
-update naming and add null check for AttachedToCreatureSourceTriggeredAbility
This commit is contained in:
htrajan 2020-04-18 13:13:02 -07:00
parent c567fc2ee1
commit 874ff7179f
5 changed files with 25 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/main/java/mage/abilities/common/AttachedToCreatureTriggeredAbility.java → Mage/src/main/java/mage/abilities/common/AttachedToCreatureSourceTriggeredAbility.java
View file

@ -13,19 +13,21 @@ import static mage.constants.CardType.CREATURE;
*
* @author htrajan
*/
public class AttachedToCreatureTriggeredAbility extends TriggeredAbilityImpl {
public class AttachedToCreatureSourceTriggeredAbility extends TriggeredAbilityImpl {
public AttachedToCreatureTriggeredAbility(Effect effect, boolean optional) {
public AttachedToCreatureSourceTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
}
public AttachedToCreatureTriggeredAbility(final AttachedToCreatureTriggeredAbility ability) {
public AttachedToCreatureSourceTriggeredAbility(final AttachedToCreatureSourceTriggeredAbility ability) {
super(ability);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.ATTACHED && event.getSourceId().equals(this.getSourceId());
return event.getType() == GameEvent.EventType.ATTACHED
&& event.getSourceId() != null
&& event.getSourceId().equals(this.getSourceId());
}
@Override
@ -40,7 +42,7 @@ public class AttachedToCreatureTriggeredAbility extends TriggeredAbilityImpl {
}
@Override
public AttachedToCreatureTriggeredAbility copy() {
return new AttachedToCreatureTriggeredAbility(this);
public AttachedToCreatureSourceTriggeredAbility copy() {
return new AttachedToCreatureSourceTriggeredAbility(this);
}
}