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

- NPE prevention in ComputerUtil.

Browse Source
This commit is contained in:
Agetian
2017-08-25 14:59:22 +00:00
parent ad1e17f329
commit ef4dd57032
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/ComputerUtil.java
View File

@@ -1437,6 +1437,7 @@ public class ComputerUtil {
} }
SpellAbility saviorWithSubs = saviour; SpellAbility saviorWithSubs = saviour;
ApiType saviorWithSubsApi = saviorWithSubs == null ? null : saviorWithSubs.getApi();
while (saviorWithSubs != null) { while (saviorWithSubs != null) {
ApiType curApi = saviorWithSubs.getApi(); ApiType curApi = saviorWithSubs.getApi();
if (curApi == ApiType.Pump || curApi == ApiType.PumpAll) { if (curApi == ApiType.Pump || curApi == ApiType.PumpAll) {
@@ -1599,8 +1600,7 @@ public class ComputerUtil {
&& !topStack.hasParam("NoRegen")) || saviourApi == ApiType.ChangeZone && !topStack.hasParam("NoRegen")) || saviourApi == ApiType.ChangeZone
|| saviourApi == ApiType.Pump || saviourApi == ApiType.PumpAll || saviourApi == ApiType.Pump || saviourApi == ApiType.PumpAll
|| saviourApi == ApiType.Protection || saviourApi == null || saviourApi == ApiType.Protection || saviourApi == null
|| saviorWithSubs.getApi() == ApiType.Pump || saviorWithSubsApi == ApiType.Pump || saviorWithSubsApi == ApiType.PumpAll)) {
|| saviorWithSubs.getApi() == ApiType.PumpAll)) {
for (final Object o : objects) { for (final Object o : objects) {
if (o instanceof Card) { if (o instanceof Card) {
final Card c = (Card) o; final Card c = (Card) o;