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

Fixed NPE on empty net mana returns (from some effects);

Browse source
This commit is contained in:
Oleg Agafonov 2020-01-15 03:50:27 +04:00
parent 6714a092b2
commit bcb5be77be
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/abilities/effects/common/ManaEffect.java
View file

@ -39,7 +39,7 @@ public abstract class ManaEffect extends OneShotEffect {
return false;
}
Mana manaToAdd = produceMana(game, source);
if (manaToAdd.count() > 0) {
if (manaToAdd != null && manaToAdd.count() > 0) {
checkToFirePossibleEvents(manaToAdd, game, source);
addManaToPool(player, manaToAdd, game, source);
}
@ -65,7 +65,7 @@ public abstract class ManaEffect extends OneShotEffect {
public List<Mana> getNetMana(Game game, Ability source) {
List<Mana> netMana = new ArrayList<>();
Mana mana = produceMana(game, source);
if (mana != null) {
if (mana != null && mana.count() > 0) {
netMana.add(mana);
}
return netMana;
@ -80,7 +80,7 @@ public abstract class ManaEffect extends OneShotEffect {
*
* @param game
* @param source
* @return
* @return can return null or empty mana
*/
public abstract Mana produceMana(Game game, Ability source);