1 files changed, 6 insertions, 23 deletions

diff --git a/src/map/mob.c b/src/map/mob.c
index 74d25b805..52705cf4d 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2151,6 +2151,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 	struct map_session_data *sd = BL_CAST(BL_PC, src);
 	struct map_session_data *tmpsd[DAMAGELOG_SIZE] = { NULL };
 	struct map_session_data *mvp_sd = sd, *second_sd = NULL, *third_sd = NULL;
+	struct item_data *id = NULL;
 
 	struct {
 		struct party_data *p;
@@ -2439,23 +2440,13 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 
 			ditem = mob->setdropitem(md->db->dropitem[i].nameid, 1, it);
 
-			//A Rare Drop Global Announce by Lupus
-			if( mvp_sd && drop_rate <= battle_config.rare_drop_announce ) {
-				char message[128];
-				sprintf (message, msg_txt(541), mvp_sd->status.name, md->name, it->jname, (float)drop_rate/100);
-				//MSG: "'%s' won %s's %s (chance: %0.02f%%)"
-				intif->broadcast(message, (int)strlen(message)+1, BC_DEFAULT);
+			// Official Drop Announce [Jedzkie]
+			if (mvp_sd != NULL) {
+				if ((id = itemdb->search(it->nameid)) != NULL && id->flag.drop_announce) {
+					clif->item_drop_announce(mvp_sd, it->nameid, md->name);
+				}
 			}
 
-			/* heres the thing we got the feature set up however we're still discussing how to best define the ids,
-			 * so while we discuss, for a small period of time, the list is hardcoded (yes officially only those 2 use it,
-			 * thus why we're unsure on how to best place the setting) */
-			/* temp, will not be hardcoded for long thudu. */
-			// TODO: This should be a field in the item db.
-			if (mvp_sd != NULL
-			 && (it->nameid == ITEMID_GOLD_KEY77 || it->nameid == ITEMID_SILVER_KEY77)) /* for when not hardcoded: add a check on mvp bonus drop as well */
-				clif->item_drop_announce(mvp_sd, it->nameid, md->name);
-
 			// Announce first, or else ditem will be freed. [Lance]
 			// By popular demand, use base drop rate for autoloot code. [Skotlex]
 			mob->item_drop(md, dlist, ditem, 0, md->db->dropitem[i].p, homkillonly);
@@ -2592,14 +2583,6 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 					clif->mvp_item(mvp_sd, item.nameid);
 					log_mvp[0] = item.nameid;
 
-					//A Rare MVP Drop Global Announce by Lupus
-					if (rate <= battle_config.rare_drop_announce) {
-						char message[128];
-						sprintf(message, msg_txt(541), mvp_sd->status.name, md->name, data->jname, rate/100.);
-						//MSG: "'%s' won %s's %s (chance: %0.02f%%)"
-						intif->broadcast(message, (int)strlen(message)+1, BC_DEFAULT);
-					}
-
 					if((temp = pc->additem(mvp_sd,&item,1,LOG_TYPE_PICKDROP_PLAYER)) != 0) {
 						clif->additem(mvp_sd,0,0,temp);
 						map->addflooritem(&md->bl, &item, 1, mvp_sd->bl.m, mvp_sd->bl.x, mvp_sd->bl.y, mvp_sd->status.char_id, (second_sd?second_sd->status.char_id : 0), (third_sd ? third_sd->status.char_id : 0), 1);