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

- Fixed a possible NPE in getPumpCreatures (AF Pump).

Browse Source
This commit is contained in:
Sloth
2011-09-02 08:14:37 +00:00
parent 981cd06414
commit daacb0427c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java
View File

@@ -236,10 +236,11 @@ public class AbilityFactory_Pump {
&& AllZone.getCombat().isUnblocked(c) && attack > 0) && AllZone.getCombat().isUnblocked(c) && attack > 0)
return true; return true;
//is the creature in blocked and the blocker would survive //is the creature blocked and the blocker would survive
if (AllZone.getPhase().isAfter(Constant.Phase.Combat_Declare_Blockers) && AllZone.getCombat().isAttacking(c) if (AllZone.getPhase().isAfter(Constant.Phase.Combat_Declare_Blockers) && AllZone.getCombat().isAttacking(c)
&& AllZone.getCombat().isBlocked(c) && AllZone.getCombat().isBlocked(c)
&& CombatUtil.blockerWouldBeDestroyed(AllZone.getCombat().getBlockers(c).get(0))) && AllZone.getCombat().getBlockers(c) != null
&& !CombatUtil.blockerWouldBeDestroyed(AllZone.getCombat().getBlockers(c).get(0)))
return true; return true;
//if the life of the computer is in danger, try to pump potential blockers before declaring blocks //if the life of the computer is in danger, try to pump potential blockers before declaring blocks