From 0cfaeaad981a7ce36fe752e5abdfc55cbe99f57c Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 26 Sep 2017 18:16:55 -0400 Subject: [PATCH] v0.6.2: fixed bugs with plant logic caused by recent code changes --- .../shatteredpixel/shatteredpixeldungeon/levels/Level.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/plants/Plant.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java index fedaeeee6..16b9b5a21 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java @@ -722,7 +722,7 @@ public abstract class Level implements Bundlable { flamable[pos] = true; } - plant = seed.couch( pos ); + plant = seed.couch( pos, this ); plants.put( pos, plant ); GameScene.plantSeed( pos ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java index 9e4e2ed64..00fa55937 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java @@ -36,6 +36,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Dewdrop; import com.shatteredpixel.shatteredpixeldungeon.items.Generator; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.SandalsOfNature; +import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.watabou.noosa.audio.Sample; @@ -166,9 +167,9 @@ public abstract class Plant implements Bundlable { } } - public Plant couch( int pos ) { + public Plant couch( int pos, Level level ) { try { - if (Dungeon.level.heroFOV != null && Dungeon.level.heroFOV[pos]) { + if (level.heroFOV != null && level.heroFOV[pos]) { Sample.INSTANCE.play(Assets.SND_PLANT); } Plant plant = plantClass.newInstance();