External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Safe Passage - Fixed a problem that damage to player was not prevented (fixes #6995).

Browse source
This commit is contained in:
LevelX2 2020-08-25 16:30:48 +02:00
parent ced6965b59
commit f1d2d2fb22
3 changed files with 108 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/main/java/mage/abilities/effects/common/PreventAllDamageToAllEffect.java
View file

@ -1,6 +1,5 @@
package mage.abilities.effects.common;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.PreventionEffectImpl;
import mage.constants.Duration;
@ -13,6 +12,8 @@ import mage.game.Game;
import mage.game.events.GameEvent;
import java.util.UUID;
import mage.MageItem;
import mage.game.events.GameEvent.EventType;
/**
* @author BetaSteward_at_googlemail.com
@ -34,7 +35,7 @@ public class PreventAllDamageToAllEffect extends PreventionEffectImpl {
}
public PreventAllDamageToAllEffect(Duration duration, FilterPermanentOrPlayer filter, boolean onlyCombat) {
super(duration, Integer.MAX_VALUE, onlyCombat);
super(duration, Integer.MAX_VALUE, onlyCombat, false);
this.filter = filter;
staticText = "Prevent all "
+ (onlyCombat ? "combat " : "")
@ -84,7 +85,12 @@ public class PreventAllDamageToAllEffect extends PreventionEffectImpl {
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (super.applies(event, source, game)) {
MageObject object = game.getObject(event.getTargetId());
MageItem object ;
if(EventType.DAMAGE_PLAYER.equals(event.getType())) {
object = game.getPlayer(event.getTargetId());
} else {
object = game.getObject(event.getTargetId());
}
if (object != null) {
return filter.match(object, source.getSourceId(), source.getControllerId(), game);
}