Permalink
Browse files

Merge pull request #2298 from guilherme-gm/201810-abracadabra

Fixes delayed-consume items not being consumed after using Abracadabra
  • Loading branch information...
MishimaHaruna committed Dec 16, 2018
2 parents 65eacab + bf54e86 commit 914da2d2410ac32e22d825f633b617cc22f84050
Showing with 4 additions and 0 deletions.
  1. +4 −0 src/map/pc.c
@@ -5319,6 +5319,10 @@ static int pc_useitem(struct map_session_data *sd, int n)
if(sd->catch_target_class != -1) //Abort pet catching.
sd->catch_target_class = -1;

// Removes abracadabra/randomize spell flag for delayed consume items or item doesn't get consumed
if (sd->inventory_data[n]->flag.delay_consume)
sd->state.abra_flag = 0;

amount = sd->status.inventory[n].amount;
//Check if the item is to be consumed immediately [Skotlex]
if (sd->inventory_data[n]->flag.delay_consume || sd->inventory_data[n]->flag.keepafteruse)

0 comments on commit 914da2d

Please sign in to comment.