Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fixed NPE errors

Browse source
This commit is contained in:
Oleg Agafonov 2019-12-15 15:00:31 +04:00
parent ca0297d7c8
commit be6a588a7f
19 changed files with 37 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/util/CardUtil.java
View file

@ -565,7 +565,7 @@ public final class CardUtil {
public static boolean haveSameNames(String name1, String name2, Boolean ignoreMtgRuleForEmptyNames) {
if (ignoreMtgRuleForEmptyNames) {
// simple compare for tests and engine
return name1 != null && name2 != null && name1.equals(name2);
return name1 != null && name1.equals(name2);
} else {
// mtg logic compare for game (empty names can't be same)
return !haveEmptyName(name1) && !haveEmptyName(name2) && name1.equals(name2);
@ -587,4 +587,9 @@ public final class CardUtil {
public static boolean haveEmptyName(MageObject object) {
return object == null || haveEmptyName(object.getName());
}
public static UUID getMainCardId(Game game, UUID objectId) {
Card card = game.getCard(objectId);
return card != null ? card.getMainCard().getId() : objectId;
}
}