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

change enum comparison

Browse source
This commit is contained in:
igoudt 2018-07-08 13:11:39 +02:00
parent 36c004122a
commit d6450eed94
32 changed files with 41 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/designations/Monarch.java
View file

@ -84,8 +84,7 @@ class MonarchDealsCombatDamageToAPlayerTriggeredAbility extends TriggeredAbility
public boolean checkTrigger(GameEvent event, Game game) {
if (((DamagedPlayerEvent) event).isCombatDamage()) {
MageObject damagingObject = game.getObject(event.getSourceId());
if (damagingObject != null
&& damagingObject instanceof Permanent
if (damagingObject instanceof Permanent
&& damagingObject.isCreature()
&& event.getTargetId().equals(game.getMonarchId())) {
setControllerId(event.getPlayerId());