LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.0.1: fixed non-disarmable traps being disarmed by time freeze

Browse Source
This commit is contained in:
Evan Debenham 2021-08-19 15:26:40 -04:00
parent 7d6e576331
commit 76131f2775
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java
View File

@ -347,7 +347,7 @@ public class TimekeepersHourglass extends Artifact {
public void disarmPressedTraps(){ public void disarmPressedTraps(){
for (int cell : presses){ for (int cell : presses){
Trap t = Dungeon.level.traps.get(cell); Trap t = Dungeon.level.traps.get(cell);
if (t != null) t.disarm(); if (t != null && t.disarmedByActivation) t.disarm();
} }
presses = new ArrayList<>(); presses = new ArrayList<>();

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Swiftthistle.java
View File

@ -131,7 +131,7 @@ public class Swiftthistle extends Plant {
public void disarmPressedTraps(){ public void disarmPressedTraps(){
for (int cell : presses){ for (int cell : presses){
Trap t = Dungeon.level.traps.get(cell); Trap t = Dungeon.level.traps.get(cell);
if (t != null) t.disarm(); if (t != null && t.disarmedByActivation) t.disarm();
} }
presses = new ArrayList<>(); presses = new ArrayList<>();