Fixed some bugs causing null pointer or concurrent modification exceptions.

This commit is contained in:
LevelX2 2015-09-07 07:42:19 +02:00
parent 0cb92e6936
commit b3eb6f536a
4 changed files with 15 additions and 16 deletions

View file

@ -133,10 +133,14 @@ public class GameView implements Serializable {
new StackAbilityView(game, (StackAbility) stackObject, object.getName(), new CardView(new EmblemView(((Emblem) object), sourceCard))));
checkPaid(stackObject.getId(), ((StackAbility) stackObject));
} else {
StackAbility stackAbility = ((StackAbility) object);
stackAbility.newId();
stack.put(stackObject.getId(), new CardView(((StackAbility) stackObject)));
checkPaid(stackObject.getId(), ((StackAbility) stackObject));
if (object instanceof StackAbility) {
StackAbility stackAbility = ((StackAbility) object);
stackAbility.newId();
stack.put(stackObject.getId(), new CardView(((StackAbility) stackObject)));
checkPaid(stackObject.getId(), ((StackAbility) stackObject));
} else {
logger.fatal("Object can't be cast to StackAbility: " + object.getName() + " " + object.toString());
}
}
} else {
logger.error("Stack Object for stack ability not found: " + stackObject.getStackAbility().getRule());