readjust

sader1992 · Jun 25, 2020 · 57018fda8f80db4b9a5e8faa20924ad96c75fb5b · 57018fd
1 parent 3b68dd4
commit 57018fda8f80db4b9a5e8faa20924ad96c75fb5b
Showing with 5 additions and 7 deletions.

+3 −2 src/map/mob.cpp

+1 −4 src/map/pc.cpp

+1 −1 src/map/pc.hpp
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
@@ -2190,8 +2190,9 @@ static void mob_item_drop(struct mob_data *md, struct item_drop_list *dlist, str
 	sd = map_charid2sd(dlist->first_charid);
 	if( sd == NULL ) sd = map_charid2sd(dlist->second_charid);
 	if( sd == NULL ) sd = map_charid2sd(dlist->third_charid);
-	test_autoloot = sd 
-		&& (drop_rate <= sd->state.autoloot || pc_isautolooting(sd, ditem->item_data.nameid, md))
+	test_autoloot = sd
+		&& (itemdb_type(ditem->item_data.nameid) != IT_CARD && !status_has_mode(&md->status, MD_MVP))
+		&& (drop_rate <= sd->state.autoloot || pc_isautolooting(sd, ditem->item_data.nameid))
 		&& (flag?(battle_config.homunculus_autoloot?(battle_config.hom_idle_no_share == 0 || !pc_isidle_hom(sd)):0):
 			(battle_config.idle_no_autoloot == 0 || DIFF_TICK(last_tick, sd->idletime) < battle_config.idle_no_autoloot));
 #ifdef AUTOLOOT_DISTANCE

diff --git a/src/map/pc.cpp b/src/map/pc.cpp
@@ -11497,13 +11497,10 @@ void pc_overheat(struct map_session_data *sd, int16 heat) {
 /**
  * Check if player is autolooting given itemID.
  */
-bool pc_isautolooting(struct map_session_data *sd, unsigned short nameid, struct mob_data* md)
+bool pc_isautolooting(struct map_session_data *sd, unsigned short nameid)
 {
 	uint8 i = 0;
 
-	if (itemdb_type(nameid) == 6 || (md && status_has_mode(&md->status, MD_MVP)))
-		return false;
-
 	if (sd->state.autoloottype && sd->state.autoloottype&(1<<itemdb_type(nameid)))
 		return true;
 

diff --git a/src/map/pc.hpp b/src/map/pc.hpp
@@ -1349,7 +1349,7 @@ void pc_inventory_rental_add(struct map_session_data *sd, unsigned int seconds);
 
 int pc_read_motd(void); // [Valaris]
 int pc_disguise(struct map_session_data *sd, int class_);
-bool pc_isautolooting(struct map_session_data *sd, unsigned short nameid, struct mob_data* md);
+bool pc_isautolooting(struct map_session_data *sd, unsigned short nameid);
 
 void pc_overheat(struct map_session_data *sd, int16 heat);