konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.3.0: added some more safety checks to quickslot buttons

Browse Source
This commit is contained in:
Evan Debenham
2025-10-16 13:12:42 -04:00
parent 6f7eba2006
commit dcf74e0d3d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
+3 -2
View File
@@ -73,6 +73,7 @@ public class QuickSlotButton extends Button {
instance = new QuickSlotButton[QuickSlot.SIZE]; instance = new QuickSlotButton[QuickSlot.SIZE];
lastTarget = null; lastTarget = null;
targetingSlot = -1;
} }
@Override @Override
@@ -85,7 +86,7 @@ public class QuickSlotButton extends Button {
if (!Dungeon.hero.isAlive() || !Dungeon.hero.ready){ if (!Dungeon.hero.isAlive() || !Dungeon.hero.ready){
return; return;
} }
if (targetingSlot == slotNum) { if (targetingSlot == slotNum && lastTarget != null) {
int cell = autoAim(lastTarget, select(slotNum)); int cell = autoAim(lastTarget, select(slotNum));
if (cell != -1){ if (cell != -1){
@@ -349,7 +350,7 @@ public class QuickSlotButton extends Button {
//FIXME: this is currently very expensive, should either optimize ballistica or this, or both //FIXME: this is currently very expensive, should either optimize ballistica or this, or both
public static int autoAim(Char target, Item item){ public static int autoAim(Char target, Item item){
if (Dungeon.hero == null){ if (Dungeon.hero == null || target == null){
return -1; return -1;
} }