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

* Fixed available mana generation of Virdian Joiner (#6698).

Browse source
This commit is contained in:
LevelX2 2020-07-27 23:50:07 +02:00
parent 8e27ca31cd
commit 82a9726a35
4 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/abilities/dynamicvalue/common/SourcePermanentPowerCount.java
View file

@ -31,7 +31,9 @@ public class SourcePermanentPowerCount implements DynamicValue {
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
Permanent sourcePermanent = game.getPermanent(sourceAbility.getSourceId());
if (sourcePermanent == null || sourcePermanent.getZoneChangeCounter(game) > sourceAbility.getSourceObjectZoneChangeCounter()) {
if (sourcePermanent == null
|| (sourceAbility.getSourceObjectZoneChangeCounter() > 0
&& sourcePermanent.getZoneChangeCounter(game) > sourceAbility.getSourceObjectZoneChangeCounter())) {
sourcePermanent = (Permanent) game.getLastKnownInformation(sourceAbility.getSourceId(), Zone.BATTLEFIELD);
}
if (sourcePermanent != null

11
Mage/src/main/java/mage/abilities/mana/DynamicManaAbility.java
View file

@ -79,17 +79,6 @@ public class DynamicManaAbility extends ActivatedManaAbilityImpl {
return new DynamicManaAbility(this);
}
@Override
public List<Mana> getNetMana(Game game) {
List<Mana> netMana = new ArrayList<>();
if (game != null) {
// TODO: effects from replacement effects like Mana Reflection are not considered yet
// TODO: effects that need a X payment (e.g. Mage-Ring Network) return always 0
netMana.addAll(manaEffect.getNetMana(game, this));
}
return netMana;
}
@Override
public boolean definesMana(Game game) {
return true;