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

v0.9.2: added some safety checks to combo

Browse Source
This commit is contained in:
Evan Debenham 2021-02-19 17:40:19 -05:00
parent 85b2ce7373
commit 4cc28b269a
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
View File

@ -232,7 +232,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
@Override
public void detach() {
if (!parried) target.buff(Combo.class).detach();
if (!parried && target.buff(Combo.class) != null) target.buff(Combo.class).detach();
super.detach();
}
}
@ -244,13 +244,15 @@ public class Combo extends Buff implements ActionIndicator.Action {
@Override
public boolean act() {
moveBeingUsed = ComboMove.PARRY;
target.sprite.attack(enemy.pos, new Callback() {
@Override
public void call() {
target.buff(Combo.class).doAttack(enemy);
}
});
if (target.buff(Combo.class) != null) {
moveBeingUsed = ComboMove.PARRY;
target.sprite.attack(enemy.pos, new Callback() {
@Override
public void call() {
target.buff(Combo.class).doAttack(enemy);
}
});
}
detach();
return true;
}
@ -318,7 +320,8 @@ public class Combo extends Buff implements ActionIndicator.Action {
dist ++;
Buff.prolong(enemy, Vertigo.class, 3);
} else {
while (dist > 0 && Dungeon.level.pit[trajectory.path.get(dist)]) {
while (dist > trajectory.dist ||
(dist > 0 && Dungeon.level.pit[trajectory.path.get(dist)])) {
dist--;
}
}