konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.3.0: fixed rotberry being deleted by time freeze + stairs

Browse Source
This commit is contained in:
Evan Debenham
2023-12-15 13:21:50 -05:00
parent 92d2920d11
commit ebb384affd
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java
+5 -1
View File
@@ -37,6 +37,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEnergy;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.plants.Plant; import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
import com.shatteredpixel.shatteredpixeldungeon.plants.Rotberry;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
@@ -379,7 +380,10 @@ public class TimekeepersHourglass extends Artifact {
t.disarm(); t.disarm();
} }
Dungeon.level.uproot(cell); Plant p = Dungeon.level.plants.get(cell);
if (p != null && !(p instanceof Rotberry)) {
Dungeon.level.uproot(cell);
}
} }
presses = new ArrayList<>(); presses = new ArrayList<>();
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Swiftthistle.java
+4 -1
View File
@@ -143,7 +143,10 @@ public class Swiftthistle extends Plant {
t.disarm(); t.disarm();
} }
Dungeon.level.uproot(cell); Plant p = Dungeon.level.plants.get(cell);
if (p != null && !(p instanceof Rotberry)) {
Dungeon.level.uproot(cell);
}
} }
presses = new ArrayList<>(); presses = new ArrayList<>();