From a7d7a50e451343d54e978a1009b730d7c77192d6 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 26 Sep 2019 19:40:28 -0400 Subject: [PATCH] v0.7.5: fixed crash issues with tengu --- .../shatteredpixeldungeon/actors/mobs/NewTengu.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java index 66673686b..c8cd006e8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/NewTengu.java @@ -347,7 +347,7 @@ public class NewTengu extends Mob { @Override public boolean act(boolean enemyInFOV, boolean justAlerted) { - if (!enemyInFOV && fieldOfView[enemy.pos]){ + if (enemy != null && !enemyInFOV && fieldOfView[enemy.pos]){ if (!yelledCoward) { yell(Messages.get(NewTengu.class, "coward")); yelledCoward = true; @@ -456,6 +456,11 @@ public class NewTengu extends Mob { switch (abilityToUse){ case BOMB_ABILITY : default: abilityUsed = throwBomb(NewTengu.this, enemy); + //if Tengu cannot use his bomb ability first, use fire instead. + if (abilitiesUsed == 0 && !abilityUsed){ + abilityToUse = FIRE_ABILITY; + abilityUsed = throwFire(NewTengu.this, enemy); + } break; case FIRE_ABILITY: abilityUsed = throwFire(NewTengu.this, enemy);