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

* Some more changes for rework of ENTERS_THE_BATTLEFIELD event and card movement.

Browse source
This commit is contained in:
LevelX2 2015-10-18 23:33:23 +02:00
parent 4216fbab8c
commit 415700ccb2
129 changed files with 1029 additions and 1265 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/mage/abilities/AbilityImpl.java
View file

@ -952,16 +952,15 @@ public abstract class AbilityImpl implements Ability {
// for singleton abilities like Flying we can't rely on abilities' source because it's only once in continuous effects
// so will use the sourceId of the object itself that came as a parameter if it is not null
if (object == null) {
object = game.getObject(getSourceId());
object = game.getPermanentEntering(getSourceId());
if (object == null) {
object = game.getObject(getSourceId());
}
}
if (object != null && !object.getAbilities().contains(this)) {
if (object instanceof Permanent) {
return false;
} else {
Permanent permanent = game.getPermanentEntering(getSourceId());
if (permanent != null && permanent.getAbilities().contains(this)) {
return true;
}
// check if it's an ability that is temporary gained to a card
Abilities<Ability> otherAbilities = game.getState().getAllOtherAbilities(this.getSourceId());
if (otherAbilities == null || !otherAbilities.contains(this)) {