diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2008-10-11 03:49:10 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2008-10-11 03:49:10 +0000 |
| commit | 4714f80db868134997efdfff750b5d43650b5171 (patch) | |
| tree | d73a0fd6b542b352b858fd6ef83a6c36ffa26c46 /src/map/mob.c | |
| parent | 7d8c845f895fe213b5e463a0638ebdf94f507c0b (diff) | |
| download | tmwa-4714f80db868134997efdfff750b5d43650b5171.tar.gz tmwa-4714f80db868134997efdfff750b5d43650b5171.tar.bz2 tmwa-4714f80db868134997efdfff750b5d43650b5171.tar.xz tmwa-4714f80db868134997efdfff750b5d43650b5171.zip | |
Commit magic patch v13
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 1304a41..d53cbfe 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1881,7 +1881,7 @@ static int mob_delay_item_drop(int tid,unsigned int tick,int id,int data) if(battle_config.item_auto_get==1){ if(ditem->first_sd && (flag = pc_additem(ditem->first_sd,&temp_item,ditem->amount))){ - clif_additem(ditem->first_sd,0,0,flag); + clif_additem(ditem->first_sd,0,0,flag); map_addflooritem(&temp_item,1,ditem->m,ditem->x,ditem->y,ditem->first_sd,ditem->second_sd,ditem->third_sd,0); } free(ditem); @@ -2021,6 +2021,15 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type) nullpo_retr(0, md); //srcはNULLで呼ばれる場合もあるので、他でチェック + if (src->id == md->master_id + && md->mode & MOB_MODE_TURNS_AGAINST_BAD_MASTER) { + /* If the master hits a monster, have the monster turn against him */ + md->master_id = 0; + md->mode = 0x85; /* Regular war mode */ + md->target_id = src->id; + md->attacked_id = src->id; + } + max_hp = battle_get_max_hp(&md->bl); if(src && src->type == BL_PC) { |