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

Some changes to logged data and a NPE prevention.

Browse source
This commit is contained in:
LevelX2 2016-04-14 08:28:28 +02:00
parent 3e4c9dc645
commit 41ba4c9540
3 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/abilities/AbilityImpl.java
View file

@ -1159,6 +1159,9 @@ public abstract class AbilityImpl implements Ability {
public MageObject getSourceObject(Game game) {
if (sourceObject == null) {
setSourceObject(null, game);
if (sourceObject == null) {
logger.warn("Source object could not be retrieved: " + this.getRule());
}
}
return sourceObject;
}

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

@ -106,7 +106,10 @@ public class ManaPoolItem implements Serializable {
}
public UUID getSourceId() {
return sourceObject.getId();
if (sourceObject != null) {
return sourceObject.getId();
}
return null;
}
public UUID getOriginalId() {