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

v0.9.0: fixed rare errors with thieves stealing honeypots

Browse Source
This commit is contained in:
Evan Debenham 2020-09-13 01:18:34 -04:00
parent b41b6d58e0
commit 4e5d132c43
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Thief.java
View File

@ -144,23 +144,21 @@ public class Thief extends Mob {
protected boolean steal( Hero hero ) {
Item item = hero.belongings.randomUnequipped();
Item toSteal = hero.belongings.randomUnequipped();
if (item != null && !item.unique && item.level() < 1 ) {
if (toSteal != null && !toSteal.unique && toSteal.level() < 1 ) {
GLog.w( Messages.get(Thief.class, "stole", item.name()) );
if (!item.stackable) {
GLog.w( Messages.get(Thief.class, "stole", toSteal.name()) );
if (!toSteal.stackable) {
Dungeon.quickslot.convertToPlaceholder(item);
}
item.updateQuickslot();
Item.updateQuickslot();
item = toSteal.detach( hero.belongings.backpack );
if (item instanceof Honeypot){
this.item = ((Honeypot)item).shatter(this, this.pos);
item.detach( hero.belongings.backpack );
} else {
this.item = item.detach( hero.belongings.backpack );
if ( item instanceof Honeypot.ShatteredPot)
((Honeypot.ShatteredPot)item).pickupPot(this);
item = ((Honeypot)item).shatter(this, this.pos);
} else if (item instanceof Honeypot.ShatteredPot) {
((Honeypot.ShatteredPot)item).pickupPot(this);
}
return true;