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

v0.7.0: added safety checks when items are dropped or thrown

Browse Source
This commit is contained in:
Evan Debenham 2018-09-17 14:11:31 -04:00
parent 8663623d19
commit 2ede820dab
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
View File

@ -113,9 +113,11 @@ public class Item implements Bundlable {
} }
public void doDrop( Hero hero ) { public void doDrop( Hero hero ) {
if (hero.belongings.backpack.contains(this)) {
hero.spendAndNext(TIME_TO_DROP); hero.spendAndNext(TIME_TO_DROP);
Dungeon.level.drop(detachAll(hero.belongings.backpack), hero.pos).sprite.drop(hero.pos); Dungeon.level.drop(detachAll(hero.belongings.backpack), hero.pos).sprite.drop(hero.pos);
} }
}
//resets an item's properties, to ensure consistency between runs //resets an item's properties, to ensure consistency between runs
public void reset(){ public void reset(){
@ -124,8 +126,10 @@ public class Item implements Bundlable {
} }
public void doThrow( Hero hero ) { public void doThrow( Hero hero ) {
if (hero.belongings.backpack.contains(this)) {
GameScene.selectCell(thrower); GameScene.selectCell(thrower);
} }
}
public void execute( Hero hero, String action ) { public void execute( Hero hero, String action ) {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/Brew.java
View File

@ -45,8 +45,10 @@ public abstract class Brew extends Potion {
@Override @Override
public void doThrow(Hero hero) { public void doThrow(Hero hero) {
//identical to Item.doThrow //identical to Item.doThrow
if (hero.belongings.backpack.contains(this)) {
GameScene.selectCell(thrower); GameScene.selectCell(thrower);
} }
}
@Override @Override
public abstract void shatter( int cell ); public abstract void shatter( int cell );