mirror of
https://github.com/correl/mage.git
synced 2024-12-25 11:11:16 +00:00
Merge origin/master
This commit is contained in:
commit
f048344332
1 changed files with 2 additions and 1 deletions
|
@ -77,7 +77,8 @@ class TrostaniSelesnyasVoiceTriggeredAbility extends TriggeredAbilityImpl {
|
||||||
@Override
|
@Override
|
||||||
public boolean checkTrigger(GameEvent event, Game game) {
|
public boolean checkTrigger(GameEvent event, Game game) {
|
||||||
Permanent permanent = game.getPermanent(event.getTargetId());
|
Permanent permanent = game.getPermanent(event.getTargetId());
|
||||||
if (permanent.isCreature()
|
if (permanent != null
|
||||||
|
&& permanent.isCreature()
|
||||||
&& permanent.isControlledBy(this.controllerId)
|
&& permanent.isControlledBy(this.controllerId)
|
||||||
&& !Objects.equals(event.getTargetId(), this.getSourceId())) {
|
&& !Objects.equals(event.getTargetId(), this.getSourceId())) {
|
||||||
Effect effect = this.getEffects().get(0);
|
Effect effect = this.getEffects().get(0);
|
||||||
|
|
Loading…
Reference in a new issue