From 64ba5dd582ef673e0fc2c2fe4ced9e6ef0e9852e Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 19 Sep 2022 14:43:43 -0400 Subject: [PATCH] v1.4.0: fixed immovable chars (mainly sentries) displacing Tengu items --- .../shatteredpixel/shatteredpixeldungeon/actors/Char.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index 718178d2a..a4df32657 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -74,9 +74,11 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.rogue.DeathMark; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.warrior.Endure; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Elemental; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Tengu; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.MirrorImage; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.PrismaticImage; import com.shatteredpixel.shatteredpixeldungeon.items.Heap; +import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.AntiMagic; import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Potential; import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Viscosity; @@ -173,7 +175,10 @@ public abstract class Char extends Actor { do { n = pos + PathFinder.NEIGHBOURS8[Random.Int( 8 )]; } while (!Dungeon.level.passable[n] && !Dungeon.level.avoid[n]); - Dungeon.level.drop( heap.pickUp(), n ).sprite.drop( pos ); + Item item = heap.peek(); + if (!(item instanceof Tengu.BombAbility.BombItem || item instanceof Tengu.ShockerAbility.ShockerItem)){ + Dungeon.level.drop( heap.pickUp(), n ).sprite.drop( pos ); + } } }