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

fixed some NPEs

Browse source
This commit is contained in:
BetaSteward 2011-08-24 21:42:06 -04:00
parent d85bd073c7
commit 5023d13525
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java
View file

@ -689,8 +689,11 @@ public class ComputerPlayer2 extends ComputerPlayer<ComputerPlayer2> implements
UUID opponentId = game.getCombat().getDefenders().iterator().next(); UUID opponentId = game.getCombat().getDefenders().iterator().next();
for (UUID attackerId: combat.getAttackers()) { for (UUID attackerId: combat.getAttackers()) {
this.declareAttacker(attackerId, opponentId, game); this.declareAttacker(attackerId, opponentId, game);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled()) {
logger.debug("attacking with:" + game.getPermanent(attackerId).getName()); Permanent p = game.getPermanent(attackerId);
if (p != null)
logger.debug("attacking with:" + p.getName());
}
} }
} }
} }

2
Mage.Server/src/main/java/mage/server/TableManager.java
View file

@ -219,7 +219,7 @@ public class TableManager {
controllers.remove(tableId); controllers.remove(tableId);
tables.remove(tableId); tables.remove(tableId);
GamesRoomManager.getInstance().removeTable(tableId); GamesRoomManager.getInstance().removeTable(tableId);
if (table.getMatch().getGame() != null) if (table.getMatch() != null && table.getMatch().getGame() != null)
table.getMatch().getGame().end(); table.getMatch().getGame().end();
} }
} }

2
Mage/src/mage/abilities/condition/common/EnchantedCondition.java
View file

@ -52,7 +52,7 @@ public class EnchantedCondition implements Condition {
if (permanent != null) { if (permanent != null) {
for (UUID uuid : permanent.getAttachments()) { for (UUID uuid : permanent.getAttachments()) {
Permanent attached = game.getBattlefield().getPermanent(uuid); Permanent attached = game.getBattlefield().getPermanent(uuid);
if (attached.getCardType().contains(CardType.ENCHANTMENT)) { if (attached != null && attached.getCardType().contains(CardType.ENCHANTMENT)) {
return true; return true;
} }
} }