github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-01 19:07:57 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed two possible NPE.

Browse source
This commit is contained in:
LevelX2 2013-10-12 22:57:44 +02:00
parent a2f1d08474
commit 43da29da44
2 changed files with 5 additions and 2 deletions
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human
HumanPlayer.java
Mage/src/mage/game/combat
Combat.java

4
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -716,8 +716,8 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
updateGameStatePriority("getAmount", game);
game.fireGetAmountEvent(playerId, message, min, max);
waitForIntegerResponse(game);
if (response != null) {
return response.getInteger();
if (response != null && response.getInteger() != null) {
return response.getInteger().intValue();
} else {
return 0;
}

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

@ -559,6 +559,9 @@ public class Combat implements Serializable, Copyable<Combat> {
for (Map.Entry<UUID, Set<UUID>> entry :creaturesForcedToBlockAttackers.entrySet()) {
boolean blockIsValid;
Permanent creatureForcedToBlock = game.getPermanent(entry.getKey());
if (creatureForcedToBlock == null) {
break;
}
// creature does not block -> not allowed
if (creatureForcedToBlock.getBlocking() == 0) {
blockIsValid = false;