diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java index ae9acff19..5e548d4ed 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java @@ -255,7 +255,7 @@ public abstract class Mob extends Char { } protected boolean canAttack( Char enemy ) { - return Level.adjacent( pos, enemy.pos ) && !isCharmedBy( enemy ); + return Level.adjacent( pos, enemy.pos ); } protected boolean getCloser( int target ) { @@ -566,7 +566,7 @@ public abstract class Mob extends Char { @Override public boolean act( boolean enemyInFOV, boolean justAlerted ) { enemySeen = enemyInFOV; - if (enemyInFOV && canAttack( enemy )) { + if (enemyInFOV && !isCharmedBy( enemy ) && canAttack( enemy )) { return doAttack( enemy ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java index b3dda0232..cb4a34f44 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java @@ -115,7 +115,7 @@ public class Tengu extends Mob { @Override protected boolean canAttack( Char enemy ) { - return Ballistica.cast( pos, enemy.pos, false, true ) == enemy.pos && !isCharmedBy( enemy ); + return Ballistica.cast( pos, enemy.pos, false, true ) == enemy.pos; } @Override