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

v0.9.3: fixed Talent.onItemCollected not triggering in all cases

Browse Source
This commit is contained in:
Evan Debenham 2021-04-19 19:15:37 -04:00
parent 8daaba99a3
commit 17e312bc7d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,6 @@ public class Item implements Bundlable {
GameScene.pickUp( this, hero.pos ); GameScene.pickUp( this, hero.pos );
Sample.INSTANCE.play( Assets.Sounds.ITEM ); Sample.INSTANCE.play( Assets.Sounds.ITEM );
Talent.onItemCollected( hero, this );
hero.spendAndNext( TIME_TO_PICK_UP ); hero.spendAndNext( TIME_TO_PICK_UP );
return true; return true;
@ -206,6 +205,7 @@ public class Item implements Bundlable {
if (isSimilar( item )) { if (isSimilar( item )) {
item.merge( this ); item.merge( this );
item.updateQuickslot(); item.updateQuickslot();
Talent.onItemCollected( Dungeon.hero, item );
return true; return true;
} }
} }
@ -213,6 +213,7 @@ public class Item implements Bundlable {
if (Dungeon.hero != null && Dungeon.hero.isAlive()) { if (Dungeon.hero != null && Dungeon.hero.isAlive()) {
Badges.validateItemLevelAquired( this ); Badges.validateItemLevelAquired( this );
Talent.onItemCollected( Dungeon.hero, this );
} }
items.add( this ); items.add( this );