v1.1.0: fixed some effects not triggering for ghost & armored statues
This commit is contained in:
+1
@@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-3
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user