diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/mob.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 7c428e60e..b9c90c1f3 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1434,7 +1434,7 @@ static int mob_delay_item_drop(int tid,unsigned int tick,int id,int data) struct delay_item_drop *ditem;
ditem=(struct delay_item_drop *)id;
- map_addflooritem(&ditem->item_data,1,ditem->m,ditem->x,ditem->y,ditem->first_sd,ditem->second_sd,ditem->third_sd,0);
+ map_addflooritem(&ditem->item_data,ditem->item_data.amount,ditem->m,ditem->x,ditem->y,ditem->first_sd,ditem->second_sd,ditem->third_sd,0);
ers_free(delay_drop_ers, ditem);
return 0;
}
diff --git a/src/map/skill.c b/src/map/skill.c index 66332bac5..f0964ec01 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6827,7 +6827,6 @@ int skill_unit_onplace_timer(struct skill_unit *src,struct block_list *bl,unsign if (!battle_check_undead(race,status_get_elem_type(bl)) && race!=6)
break;
skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
- src->val2++;
break;
}
@@ -9615,11 +9614,13 @@ int skill_unit_timer_sub( struct block_list *bl, va_list ap ) group->bl_flag,bl,tick);
if (!unit->alive)
return 0;
+ /*Apparently magnus shouldn't get it's cells deleted like this. [Skotlex]
// ƒ}ƒOƒkƒX‚Í”“®‚µ‚½ƒ†ƒjƒbƒg‚Í?í?œ‚·‚é
if (group->skill_id==PR_MAGNUS && unit->val2) {
skill_delunit(unit);
return 0;
}
+ */
}
/* ŽžŠÔ?Ø‚ê?í?œ */
if((DIFF_TICK(tick,group->tick)>=group->limit || DIFF_TICK(tick,group->tick)>=unit->limit)){
|