- @pvpoff and @gvgoff will make everyone in the map stop auto-attacking now.

- when @killer is deactivated the issuer will stop attacking.
- when @killable is deactivated, everyone around the user who is attacking the issuer will stop.
- Cleaned up some the code for dispell. It no longer removes food boosts.
- Players will stop attacking when they change their look.
- Applied Alydis's fix to the mvp item logs logging mvp items even if the player couldn't get the item.
- Changed the default of debuff_on_logout to 1 since food items shouldn't dispell on logout.


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

1 files changed, 3 insertions, 2 deletions

diff --git a/src/map/mob.c b/src/map/mob.c
index ee7dfa8c3..4cde44b84 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2121,7 +2121,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 				intif_GMmessage(message,strlen(message)+1,0);
 			}
 
-			if(mvp_sd->weight*2 > mvp_sd->max_weight)
+			if((temp = mvp_sd->weight*2 > mvp_sd->max_weight))
 				map_addflooritem(&item,1,mvp_sd->bl.m,mvp_sd->bl.x,mvp_sd->bl.y,mvp_sd,second_sd,third_sd,1);
 			else if((temp = pc_additem(mvp_sd,&item,1))) {
 				clif_additem(sd,0,0,temp);
@@ -2130,7 +2130,8 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 			
 			if(log_config.enable_logs&0x200)	{//Logs items, MVP prizes [Lupus]
 				log_pick_mob(md, "M", item.nameid, -1, NULL);
-				log_pick_pc(mvp_sd, "P", item.nameid, 1, NULL);
+				if (!temp)
+					log_pick_pc(mvp_sd, "P", item.nameid, 1, NULL);
 			}
 			break;
 		}