diff options
Diffstat (limited to 'src/map/mob.c')
| -rw-r--r-- | src/map/mob.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/mob.c b/src/map/mob.c index 3fc896391..cf7791127 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -2209,12 +2209,11 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type) return 0;
}
-/* The stop walking code is triggered in battle_walkdelay which is invoked from clif_damage after a timer.
- * So the mob should stop walking in sync with the time the "attack" hits the mob. If this is bugged then the
- * fault must be looked at in battle_walkdelay, not here. [Skotlex]
- if(md->sc_data[SC_ENDURE].timer == -1) // Stop the walking [Lance]
- mob_stop_walking(md,1);
-*/
+ if(md->sc_count) {
+ if(md->sc_data[SC_CONFUSION].timer != -1)
+ status_change_end(&md->bl, SC_CONFUSION, -1);
+ }
+
if(damage > max_hp>>2)
skill_stop_dancing(&md->bl);
@@ -2590,7 +2589,8 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type) intif_GMmessage(message,strlen(message)+1,0);
}
// Announce first, or else ditem will be freed. [Lance]
- mob_item_drop(md, tick+base_drop_delay+i, ditem, 0, drop_rate);
+ // By popular demand, use base drop rate for autoloot code. [Skotlex]
+ mob_item_drop(md, tick+base_drop_delay+i, ditem, 0, md->db->dropitem[i].p);
}
// Ore Discovery [Celest]
|