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

v0.6.2: adjsuted preparation logic to be more crash resistant

Browse Source
This commit is contained in:
Evan Debenham 2017-09-30 22:00:42 -04:00
parent 6a3eeb62cc
commit b24e44db3d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Preparation.java
View File

@ -241,8 +241,8 @@ public class Preparation extends Buff implements ActionIndicator.Action {
if (Dungeon.hero.canAttack(enemy)){
if (Dungeon.hero.handle( cell )) {
Dungeon.hero.next();
return;
}
return;
}
AttackLevel lvl = AttackLevel.getLvl(turnsInvis);
@ -261,9 +261,10 @@ public class Preparation extends Buff implements ActionIndicator.Action {
}
PathFinder.Path path = PathFinder.find(Dungeon.hero.pos, cell, passable);
int attackPos = path.get(path.size()-2);
int attackPos = path == null ? -1 : path.get(path.size()-2);
if (Dungeon.level.distance(attackPos, Dungeon.hero.pos) > lvl.blinkDistance){
if (attackPos == -1 ||
Dungeon.level.distance(attackPos, Dungeon.hero.pos) > lvl.blinkDistance){
GLog.w(Messages.get(Preparation.class, "out_of_reach"));
return;
}