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

v0.6.2a: added safety checks to some usages of curItem

Browse Source
This commit is contained in:
Evan Debenham
2017-11-01 01:49:31 -04:00
parent 0ce6f14a73
commit 3a6ae784f7
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/InventoryScroll.java
View File

@@ -73,6 +73,13 @@ public abstract class InventoryScroll extends Scroll {
protected static WndBag.Listener itemSelector = new WndBag.Listener() {
@Override
public void onSelect( Item item ) {
//FIXME this safety check shouldn't be necessary
//it would be better to eliminate the curItem static variable.
if (!(curItem instanceof InventoryScroll)){
return;
}
if (item != null) {
((InventoryScroll)curItem).onItemSelected( item );

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/InventoryStone.java
View File

@@ -75,6 +75,13 @@ public abstract class InventoryStone extends Runestone {
protected static WndBag.Listener itemSelector = new WndBag.Listener() {
@Override
public void onSelect( Item item ) {
//FIXME this safety check shouldn't be necessary
//it would be better to eliminate the curItem static variable.
if (!(curItem instanceof InventoryStone)){
return;
}
if (item != null) {
((InventoryStone)curItem).onItemSelected( item );

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
View File

@@ -347,8 +347,15 @@ public abstract class Wand extends Item {
public void onSelect( Integer target ) {
if (target != null) {
final Wand curWand = (Wand)Wand.curItem;
//FIXME this safety check shouldn't be necessary
//it would be better to eliminate the curItem static variable.
final Wand curWand;
if (curItem instanceof Wand) {
curWand = (Wand) Wand.curItem;
} else {
return;
}
final Ballistica shot = new Ballistica( curUser.pos, target, curWand.collisionProperties);
int cell = shot.collisionPos;