github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-13 09:11:06 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed possible npe during combat.

Browse source
This commit is contained in:
LevelX2 2015-07-12 09:01:40 +02:00
parent 1ec6e139e1
commit 23d7713498
1 changed files with 6 additions and 4 deletions

10
Mage/src/mage/game/combat/Combat.java
View file

@ -166,13 +166,13 @@ public class Combat implements Serializable, Copyable<Combat> {
public void checkForRemoveFromCombat(Game game) {
for (UUID creatureId : getAttackers()) {
Permanent creature = game.getPermanent(creatureId);
if (!creature.getCardType().contains(CardType.CREATURE)) {
if (creature != null && !creature.getCardType().contains(CardType.CREATURE)) {
removeFromCombat(creatureId, game, true);
}
}
for (UUID creatureId : getBlockers()) {
Permanent creature = game.getPermanent(creatureId);
if (!creature.getCardType().contains(CardType.CREATURE)) {
if (creature != null && !creature.getCardType().contains(CardType.CREATURE)) {
removeFromCombat(creatureId, game, true);
}
}
@ -246,7 +246,6 @@ public class Combat implements Serializable, Copyable<Combat> {
}
public void resumeSelectAttackers(Game game) {
Player player = game.getPlayer(attackerId);
for (CombatGroup group : groups) {
for (UUID attacker : group.getAttackers()) {
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.ATTACKER_DECLARED, group.defenderId, attacker, attackerId));
@ -254,7 +253,10 @@ public class Combat implements Serializable, Copyable<Combat> {
}
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.DECLARED_ATTACKERS, attackerId, attackerId));
if (!game.isSimulation()) {
game.informPlayers(new StringBuilder(player.getLogName()).append(" attacks with ").append(groups.size()).append(groups.size() == 1 ? " creature" : " creatures").toString());
Player player = game.getPlayer(attackerId);
if (player != null) {
game.informPlayers(player.getLogName() + " attacks with " + groups.size() + (groups.size() == 1 ? " creature" : " creatures"));
}
}
}