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

v1.3.2: fixed lit bombs being thrown in with other preserved items

Browse Source
This commit is contained in:
Evan Debenham
2022-07-13 15:31:17 -04:00
parent 783dab6fc1
commit 87023151a7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java
+6 -1
View File
@@ -37,6 +37,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.items.Heap; import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.bombs.Bomb;
import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.HeavyBoomerang; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.HeavyBoomerang;
import com.shatteredpixel.shatteredpixeldungeon.levels.features.LevelTransition; import com.shatteredpixel.shatteredpixeldungeon.levels.features.LevelTransition;
@@ -334,7 +335,11 @@ public class PrisonBossLevel extends Level {
private void clearEntities(Rect safeArea){ private void clearEntities(Rect safeArea){
for (Heap heap : heaps.valueList()){ for (Heap heap : heaps.valueList()){
if (safeArea == null || !safeArea.inside(cellToPoint(heap.pos))){ if (safeArea == null || !safeArea.inside(cellToPoint(heap.pos))){
storedItems.addAll(heap.items); for (Item item : heap.items){
if (!(item instanceof Bomb) || ((Bomb)item).fuse == null){
storedItems.add(item);
}
}
heap.destroy(); heap.destroy();
} }
} }