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

fixed Gyome, Master Chef and Valentin, Dean of the Vein counting noncreature permanents (fixes #7913)

Browse source
This commit is contained in:
Evan Kranzler 2021-06-16 07:07:17 -04:00
parent 630f28bdf7
commit a5bcf94a21
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage.Sets/src/mage/cards/g/GyomeMasterChef.java
View file

@ -22,6 +22,7 @@ import mage.filter.common.FilterControlledPermanent;
import mage.game.Game; import mage.game.Game;
import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.EntersTheBattlefieldEvent;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentToken; import mage.game.permanent.PermanentToken;
import mage.game.permanent.token.FoodToken; import mage.game.permanent.token.FoodToken;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
@ -110,10 +111,14 @@ class GyomeMasterChefWatcher extends Watcher {
@Override @Override
public void watch(GameEvent event, Game game) { public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD if (event.getType() != GameEvent.EventType.ENTERS_THE_BATTLEFIELD) {
&& !(((EntersTheBattlefieldEvent) event).getTarget() instanceof PermanentToken)) { return;
playerMap.compute(event.getPlayerId(), (u, i) -> i != null ? Integer.sum(i, 1) : 1);
} }
Permanent permanent = ((EntersTheBattlefieldEvent) event).getTarget();
if (permanent == null || permanent instanceof PermanentToken || !permanent.isCreature()) {
return;
}
playerMap.compute(event.getPlayerId(), (u, i) -> i != null ? Integer.sum(i, 1) : 1);
} }
@Override @Override

2
Mage.Sets/src/mage/cards/v/ValentinDeanOfTheVein.java
View file

@ -118,7 +118,9 @@ class ValentinDeanOfTheVeinEffect extends ReplacementEffectImpl {
public boolean applies(GameEvent event, Ability source, Game game) { public boolean applies(GameEvent event, Ability source, Game game) {
ZoneChangeEvent zEvent = (ZoneChangeEvent) event; ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
return zEvent.isDiesEvent() return zEvent.isDiesEvent()
&& zEvent.getTarget() != null
&& !(zEvent.getTarget() instanceof PermanentToken) && !(zEvent.getTarget() instanceof PermanentToken)
&& zEvent.getTarget().isCreature()
&& game.getOpponents(zEvent.getTarget().getControllerId()).contains(source.getControllerId()); && game.getOpponents(zEvent.getTarget().getControllerId()).contains(source.getControllerId());
} }