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

v1.1.0: fixed some effects not triggering for ghost & armored statues

Browse Source
This commit is contained in:
Evan Debenham 2021-11-24 14:43:33 -05:00
parent d81141bd8b
commit 556028f6b5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/ArmoredStatue.java
View File

@ -91,6 +91,7 @@ public class ArmoredStatue extends Statue {
@Override @Override
public int defenseProc(Char enemy, int damage) { public int defenseProc(Char enemy, int damage) {
damage = super.defenseProc(enemy, damage);
return armor.proc(enemy, this, damage); return armor.proc(enemy, this, damage);
} }

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
View File

@ -616,10 +616,9 @@ public class DriedRose extends Artifact {
@Override @Override
public int defenseProc(Char enemy, int damage) { public int defenseProc(Char enemy, int damage) {
if (rose != null && rose.armor != null) { if (rose != null && rose.armor != null) {
return rose.armor.proc( enemy, this, damage ); damage = rose.armor.proc( enemy, this, damage );
} else {
return super.defenseProc(enemy, damage);
} }
return super.defenseProc(enemy, damage);
} }
@Override @Override