github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-13 17:00:09 -09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request from theelk801/master

Browse source 
fixed bugs  and
This commit is contained in:
theelk801 2017-08-17 22:17:01 -04:00 • committed by GitHub
commit 4ae6784164
2 changed files with 2 additions and 2 deletions

2
Mage.Sets/src/mage/cards/f/FracturedIdentity.java
View file

@ -90,7 +90,7 @@ class FracturedIdentityEffect extends OneShotEffect {
permanent.moveToExile(null, null, source.getSourceId(), game);
UUID controllerId = permanent.getControllerId();
for (UUID opponentId : game.getOpponents(controllerId)) {
PutTokenOntoBattlefieldCopyTargetEffect effect = new PutTokenOntoBattlefieldCopyTargetEffect(opponentId, null, true);
PutTokenOntoBattlefieldCopyTargetEffect effect = new PutTokenOntoBattlefieldCopyTargetEffect(opponentId, null, false);
effect.setTargetPointer(new FixedTarget(permanent, game));
effect.apply(game, source);
}

2
Mage.Sets/src/mage/cards/o/OKagachiVengefulKami.java
View file

@ -123,7 +123,7 @@ class OKagachiVengefulKamiTriggeredAbility extends TriggeredAbilityImpl {
UUID damagedPlayerId = game.getCombat().getDefenderId(sourceId);
UUID you = this.getControllerId();
Permanent p = game.getPermanent(event.getSourceId());
if (damageEvent.isCombatDamage() && p != null) {
if (damageEvent.isCombatDamage() && p != null && p.getId().equals(this.getSourceId())) {
PlayersAttackedLastTurnWatcher watcher = (PlayersAttackedLastTurnWatcher) game.getState().getWatchers().get(PlayersAttackedLastTurnWatcher.class.getSimpleName());
if (watcher != null && watcher.attackedLastTurn(damagedPlayerId, you)) {
FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent defending player controls");