external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some possible NPEs (when combat = null)

Browse Source
This commit is contained in:
Maxmtg
2013-07-31 06:54:25 +00:00
parent a0d37f7edd
commit 5ff00b2c5c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -180,14 +180,16 @@ public class CombatUtil {
return true;
}
if (attacker.hasStartOfKeyword("CantBeBlockedByAmount GT") && !combat.getBlockers(attacker).isEmpty()) {
return false;
}
// Rule 802.4a: A player can block only creatures attacking him or a planeswalker he controls
Player attacked = combat.getDefendingPlayerRelatedTo(attacker);
if (attacked != null && attacked != defendingPlayer) {
return false;
if ( combat != null ) {
if (attacker.hasStartOfKeyword("CantBeBlockedByAmount GT") && !combat.getBlockers(attacker).isEmpty()) {
return false;
}
// Rule 802.4a: A player can block only creatures attacking him or a planeswalker he controls
Player attacked = combat.getDefendingPlayerRelatedTo(attacker);
if (attacked != null && attacked != defendingPlayer) {
return false;
}
}
return CombatUtil.canBeBlocked(attacker, defendingPlayer);
}
@@ -493,7 +495,7 @@ public class CombatUtil {
*/
public static boolean canBlock(final Card attacker, final Card blocker, final Combat combat) {
if ((attacker == null) || (blocker == null)) {
if (attacker == null || blocker == null) {
return false;
}