github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-14 19:19:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed miss counter's copy in some effects;

Browse source
This commit is contained in:
Oleg Agafonov 2021-07-01 21:14:20 +04:00
parent 65dffaa75c
commit d9e414db34
6 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/cards/s/SupremeLeaderSnoke.java
View file

@ -1,7 +1,5 @@
package mage.cards.s;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.LoyaltyAbility;
import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility;
@ -32,6 +30,8 @@ import mage.target.common.TargetCreaturePermanent;
import mage.target.targetadjustment.TargetAdjuster;
import mage.watchers.common.PlayerLostLifeNonCombatWatcher;
import java.util.UUID;
/**
* @author NinthWorld
*/
@ -97,7 +97,7 @@ class OpponentNoncombatLostLifeCount implements DynamicValue {
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
PlayerLostLifeNonCombatWatcher watcher = game.getState().getWatcher(PlayerLostLifeNonCombatWatcher.class);
if(watcher != null) {
if (watcher != null) {
return watcher.getAllOppLifeLost(sourceAbility.getControllerId(), game);
}
return 0;
@ -126,7 +126,7 @@ class SupremeLeaderSnokeCounterEffect extends OneShotEffect {
public SupremeLeaderSnokeCounterEffect(final SupremeLeaderSnokeCounterEffect effect) {
super(effect);
this.counter = effect.counter;
this.counter = effect.counter.copy();
}
@Override

2
Mage/src/main/java/mage/abilities/common/EscapesWithAbility.java
View file

@ -68,7 +68,7 @@ class EscapesWithEffect extends OneShotEffect {
private EscapesWithEffect(final EscapesWithEffect effect) {
super(effect);
this.counter = effect.counter;
this.delayedTriggeredAbility = effect.delayedTriggeredAbility;
this.delayedTriggeredAbility = effect.delayedTriggeredAbility.copy();
}
@Override

3
Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldWithXCountersEffect.java
View file

@ -1,4 +1,3 @@
package mage.abilities.effects.common;
import mage.abilities.Ability;
@ -32,7 +31,7 @@ public class EntersBattlefieldWithXCountersEffect extends OneShotEffect {
public EntersBattlefieldWithXCountersEffect(final EntersBattlefieldWithXCountersEffect effect) {
super(effect);
this.counter = effect.counter;
this.counter = effect.counter.copy();
}
@Override

5
Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java
View file

@ -12,7 +12,6 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
/**
*
* @author weirddan455
*/
public class ReturnFromGraveyardToBattlefieldWithCounterTargetEffect extends ReturnFromGraveyardToBattlefieldTargetEffect {
@ -32,7 +31,7 @@ public class ReturnFromGraveyardToBattlefieldWithCounterTargetEffect extends Ret
private ReturnFromGraveyardToBattlefieldWithCounterTargetEffect(final ReturnFromGraveyardToBattlefieldWithCounterTargetEffect effect) {
super(effect);
this.counter = effect.counter;
this.counter = effect.counter.copy();
this.additional = effect.additional;
}
@ -86,7 +85,7 @@ class AddCounterTargetReplacementEffect extends ReplacementEffectImpl {
private AddCounterTargetReplacementEffect(final AddCounterTargetReplacementEffect effect) {
super(effect);
this.counter = effect.counter;
this.counter = effect.counter.copy();
}
@Override

5
Mage/src/main/java/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldWithCounterEffect.java
View file

@ -11,7 +11,6 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
/**
*
* @author weirddan455
*/
public class ReturnSourceFromGraveyardToBattlefieldWithCounterEffect extends ReturnSourceFromGraveyardToBattlefieldEffect {
@ -26,7 +25,7 @@ public class ReturnSourceFromGraveyardToBattlefieldWithCounterEffect extends Ret
private ReturnSourceFromGraveyardToBattlefieldWithCounterEffect(final ReturnSourceFromGraveyardToBattlefieldWithCounterEffect effect) {
super(effect);
this.counter = effect.counter;
this.counter = effect.counter.copy();
}
@Override
@ -77,7 +76,7 @@ class AddCounterSourceReplacementEffect extends ReplacementEffectImpl {
private AddCounterSourceReplacementEffect(final AddCounterSourceReplacementEffect effect) {
super(effect);
this.counter = effect.counter;
this.counter = effect.counter.copy();
}
@Override

3
Mage/src/main/java/mage/abilities/effects/common/counter/RemoveCounterTargetEffect.java
View file

@ -1,4 +1,3 @@
package mage.abilities.effects.common.counter;
import mage.abilities.Ability;
@ -37,7 +36,7 @@ public class RemoveCounterTargetEffect extends OneShotEffect {
public RemoveCounterTargetEffect(RemoveCounterTargetEffect effect) {
super(effect);
this.counter = effect.counter == null ? null : effect.counter.copy();
this.counter = (effect.counter == null ? null : effect.counter.copy());
}
@Override