From f3702048befd1e4a40deac606159c2d33ddaa83a Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 5 Feb 2019 16:19:05 -0500 Subject: [PATCH] v0.7.2: more bugfixes: - fixed fetid rat stink cloud persisting in rare cases - fixed hero pressing tiles while teleporting when they're flying --- .../items/scrolls/ScrollOfTeleportation.java | 6 +++--- .../shatteredpixeldungeon/sprites/FetidRatSprite.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java index d41c7b19e..2f841fab7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java @@ -100,7 +100,7 @@ public class ScrollOfTeleportation extends Scroll { } appear( hero, pos ); - Dungeon.level.press( pos, hero ); + if (!hero.flying) Dungeon.level.press( pos, hero ); Dungeon.observe(); GameScene.updateFog(); @@ -126,7 +126,7 @@ public class ScrollOfTeleportation extends Scroll { GLog.i( Messages.get(ScrollOfTeleportation.class, "tele") ); appear( hero, pos ); - Dungeon.level.press( pos, hero ); + if (!hero.flying) Dungeon.level.press( pos, hero ); Dungeon.observe(); GameScene.updateFog(); @@ -174,7 +174,7 @@ public class ScrollOfTeleportation extends Scroll { int pos = Random.element(candidates); GLog.i( Messages.get(ScrollOfTeleportation.class, "tele") ); appear( hero, pos ); - Dungeon.level.press( pos, hero ); + if (!hero.flying) Dungeon.level.press( pos, hero ); Dungeon.observe(); GameScene.updateFog(); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FetidRatSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FetidRatSprite.java index 7735cbbf7..bdf0dcc91 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FetidRatSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FetidRatSprite.java @@ -74,8 +74,8 @@ public class FetidRatSprite extends MobSprite { } @Override - public void die() { - super.die(); + public void kill() { + super.kill(); if (cloud != null) { cloud.on = false;