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

Fixed copy

Browse source
This commit is contained in:
Oleg Agafonov 2019-04-12 08:53:58 +04:00
parent 9eb8dd6ce5
commit 35f705e07b
2 changed files with 36 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Mage.Sets/src/mage/cards/s/Soulflayer.java
View file

@ -1,44 +1,26 @@
package mage.cards.s; package mage.cards.s;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.MageObjectReference; import mage.MageObjectReference;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.common.continuous.SourceEffect; import mage.abilities.effects.common.continuous.SourceEffect;
import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.*;
import mage.abilities.keyword.DelveAbility;
import mage.abilities.keyword.DoubleStrikeAbility;
import mage.abilities.keyword.FirstStrikeAbility;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.HasteAbility;
import mage.abilities.keyword.HexproofAbility;
import mage.abilities.keyword.IndestructibleAbility;
import mage.abilities.keyword.LifelinkAbility;
import mage.abilities.keyword.ReachAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.abilities.keyword.VigilanceAbility;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.cards.Cards; import mage.cards.Cards;
import mage.constants.CardType; import mage.constants.*;
import mage.constants.SubType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.util.CardUtil; import mage.util.CardUtil;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
/** /**
*
* @author LevelX2 * @author LevelX2
*/ */
public final class Soulflayer extends CardImpl { public final class Soulflayer extends CardImpl {
@ -82,7 +64,9 @@ class SoulflayerEffect extends ContinuousEffectImpl implements SourceEffect {
super(effect); super(effect);
if (effect.abilitiesToAdd != null) { if (effect.abilitiesToAdd != null) {
this.abilitiesToAdd = new HashSet<>(); this.abilitiesToAdd = new HashSet<>();
this.abilitiesToAdd.addAll(effect.abilitiesToAdd); for (Ability a : effect.abilitiesToAdd) {
this.abilitiesToAdd.add(a.copy());
}
} }
this.objectReference = effect.objectReference; this.objectReference = effect.objectReference;
} }
@ -96,6 +80,7 @@ class SoulflayerEffect extends ContinuousEffectImpl implements SourceEffect {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(source.getSourceId()); Permanent permanent = game.getPermanent(source.getSourceId());
if (permanent != null) { if (permanent != null) {
// one time abilities collect
if (objectReference == null || !objectReference.refersTo(permanent, game)) { if (objectReference == null || !objectReference.refersTo(permanent, game)) {
abilitiesToAdd = new HashSet<>(); abilitiesToAdd = new HashSet<>();
this.objectReference = new MageObjectReference(permanent, game); this.objectReference = new MageObjectReference(permanent, game);
@ -144,6 +129,8 @@ class SoulflayerEffect extends ContinuousEffectImpl implements SourceEffect {
} }
} }
} }
// all time abilities apply
for (Ability ability : abilitiesToAdd) { for (Ability ability : abilitiesToAdd) {
permanent.addAbility(ability, source.getSourceId(), game); permanent.addAbility(ability, source.getSourceId(), game);
} }

17
Mage/src/main/java/mage/abilities/abilityword/KinshipAbility.java
View file

@ -1,5 +1,3 @@
package mage.abilities.abilityword; package mage.abilities.abilityword;
import mage.abilities.Ability; import mage.abilities.Ability;
@ -21,7 +19,6 @@ import mage.players.Player;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
/** /**
*
* @author LevelX2 * @author LevelX2
*/ */
public class KinshipAbility extends TriggeredAbilityImpl { public class KinshipAbility extends TriggeredAbilityImpl {
@ -35,10 +32,10 @@ public class KinshipAbility extends TriggeredAbilityImpl {
} }
public void addKinshipEffect(Effect kinshipEffect) { public void addKinshipEffect(Effect kinshipEffect) {
for (Effect effect: this.getEffects()) { for (Effect effect : this.getEffects()) {
if (effect instanceof KinshipBaseEffect) { if (effect instanceof KinshipBaseEffect) {
((KinshipBaseEffect) effect).addEffect(kinshipEffect); ((KinshipBaseEffect) effect).addEffect(kinshipEffect);
break; break;
} }
} }
} }
@ -77,7 +74,7 @@ class KinshipBaseEffect extends OneShotEffect {
public KinshipBaseEffect(final KinshipBaseEffect effect) { public KinshipBaseEffect(final KinshipBaseEffect effect) {
super(effect); super(effect);
this.kinshipEffects.addAll(effect.kinshipEffects); this.kinshipEffects.addAll(effect.kinshipEffects.copy());
} }
public void addEffect(Effect kinshipEffect) { public void addEffect(Effect kinshipEffect) {
@ -100,15 +97,15 @@ class KinshipBaseEffect extends OneShotEffect {
Cards cards = new CardsImpl(card); Cards cards = new CardsImpl(card);
controller.lookAtCards(sourcePermanent.getName(), cards, game); controller.lookAtCards(sourcePermanent.getName(), cards, game);
if (sourcePermanent.shareSubtypes(card, game)) { if (sourcePermanent.shareSubtypes(card, game)) {
if (controller.chooseUse(outcome,new StringBuilder("Kinship - Reveal ").append(card.getLogName()).append('?').toString(), source, game)) { if (controller.chooseUse(outcome, new StringBuilder("Kinship - Reveal ").append(card.getLogName()).append('?').toString(), source, game)) {
controller.revealCards(sourcePermanent.getName(), cards, game); controller.revealCards(sourcePermanent.getName(), cards, game);
for (Effect effect: kinshipEffects) { for (Effect effect : kinshipEffects) {
effect.setTargetPointer(new FixedTarget(card.getId())); effect.setTargetPointer(new FixedTarget(card.getId()));
if (effect.getEffectType() == EffectType.ONESHOT) { if (effect.getEffectType() == EffectType.ONESHOT) {
effect.apply(game, source); effect.apply(game, source);
} else { } else {
if (effect instanceof ContinuousEffect) { if (effect instanceof ContinuousEffect) {
game.addEffect((ContinuousEffect)effect, source); game.addEffect((ContinuousEffect) effect, source);
} else { } else {
throw new UnsupportedOperationException("This kind of effect is not supported"); throw new UnsupportedOperationException("This kind of effect is not supported");
} }