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

Fixed NPE in ManaPaid events usage

Browse source
This commit is contained in:
Oleg Agafonov 2023-04-01 18:58:00 +04:00
parent ad3b76dae6
commit 1bc4b9d675
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/players/ManaPoolItem.java
View file

@ -22,7 +22,7 @@ public class ManaPoolItem implements Serializable, Emptiable {
private int black = 0; private int black = 0;
private int colorless = 0; private int colorless = 0;
private ConditionalMana conditionalMana; private ConditionalMana conditionalMana;
private MageObject sourceObject; private MageObject sourceObject; // source of the mana, can be null (what's use case for null values? JayDi85)
private UUID originalId; // originalId of the mana producing ability private UUID originalId; // originalId of the mana producing ability
private boolean flag = false; private boolean flag = false;
private Duration duration; private Duration duration;

4
Mage/src/main/java/mage/watchers/common/ManaPaidSourceWatcher.java
View file

@ -59,10 +59,10 @@ public class ManaPaidSourceWatcher extends Watcher {
private void increment(MageObject sourceObject, ManaType manaType, Game game) { private void increment(MageObject sourceObject, ManaType manaType, Game game) {
total++; total++;
if (sourceObject.hasSubtype(SubType.TREASURE, game)) { if (sourceObject != null && sourceObject.hasSubtype(SubType.TREASURE, game)) {
treasure++; treasure++;
} }
if (!sourceObject.isSnow()) { if (sourceObject != null && !sourceObject.isSnow()) {
return; return;
} }
switch (manaType) { switch (manaType) {