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

Additional fixes for getNetMana from #6132 (final)

Browse source
This commit is contained in:
Oleg Agafonov 2020-01-03 06:27:39 +04:00
parent 579a37c7c8
commit dceb93e7a6
22 changed files with 219 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaEffect.java
View file

@ -10,10 +10,8 @@ import mage.abilities.Ability;
import mage.abilities.effects.common.ManaEffect;
import mage.abilities.mana.builder.ConditionalManaBuilder;
import mage.game.Game;
import mage.players.Player;
/**
*
* @author LevelX2
*/
public class AddConditionalManaEffect extends ManaEffect {
@ -30,7 +28,7 @@ public class AddConditionalManaEffect extends ManaEffect {
public AddConditionalManaEffect(final AddConditionalManaEffect effect) {
super(effect);
this.mana = effect.mana;
this.mana = effect.mana.copy();
this.manaBuilder = effect.manaBuilder;
}

3
Mage/src/main/java/mage/abilities/effects/mana/AddManaToManaPoolSourceControllerEffect.java
View file

@ -14,7 +14,6 @@ import mage.game.Game;
import mage.players.Player;
/**
*
* @author magenoxx
*/
public class AddManaToManaPoolSourceControllerEffect extends OneShotEffect {
@ -29,7 +28,7 @@ public class AddManaToManaPoolSourceControllerEffect extends OneShotEffect {
public AddManaToManaPoolSourceControllerEffect(final AddManaToManaPoolSourceControllerEffect effect) {
super(effect);
this.mana = effect.mana;
this.mana = effect.mana.copy();
}
@Override

2
Mage/src/main/java/mage/abilities/effects/mana/AddManaToManaPoolTargetControllerEffect.java
View file

@ -44,7 +44,7 @@ public class AddManaToManaPoolTargetControllerEffect extends ManaEffect {
public AddManaToManaPoolTargetControllerEffect(final AddManaToManaPoolTargetControllerEffect effect) {
super(effect);
this.mana = effect.mana;
this.mana = effect.mana.copy();
this.emptyOnlyOnTurnsEnd = effect.emptyOnlyOnTurnsEnd;
}

2
Mage/src/main/java/mage/abilities/mana/ConditionalColorlessManaAbility.java
View file

@ -12,7 +12,6 @@ import mage.abilities.mana.builder.ConditionalManaBuilder;
import mage.constants.Zone;
/**
*
* @author LevelX2
*/
public class ConditionalColorlessManaAbility extends ActivatedManaAbilityImpl {
@ -23,7 +22,6 @@ public class ConditionalColorlessManaAbility extends ActivatedManaAbilityImpl {
public ConditionalColorlessManaAbility(Cost cost, int amount, ConditionalManaBuilder manaBuilder) {
super(Zone.BATTLEFIELD, new AddConditionalColorlessManaEffect(amount, manaBuilder), cost);
// this.netMana.add(Mana.ColorlessMana(amount)); // When produced during runtime, condition is added (how to add condition here?)
}
public ConditionalColorlessManaAbility(final ConditionalColorlessManaAbility ability) {