- Autoloot now uses the item's base drop chance rather than final drop rate to determine if it should autoloot the item or not.

- Fixed super novices getting +10 to all stats temporarily whentheir death count isn't zero.
- Fixed Kahai displaying HP-SP as the total healed instead of HP
- Cleaned up skill_repairweapon to prevent crashes when the target vanishes/changes/whatever before the weapon to repair has been selected.
- Parsing the Storage/Guild Storage from the char server will now fail if the storage has been modified and not saved yet.
- Being hit now cancels confuse.
- Added back the bleeding icon.
- Fixed Combo Finish Soul Linked Effect being a 11x11 area o.O


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5121 54d463be-8e91-2dee-dedb-b68131a5f0ec

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]