- Corrected skill_check_condition to not delete items right away for certain skills that do the deletion themselves. Fixes several skills consuming items twice.

- Dispel's success rate is no longer affected by MDEF
- You are no longer blocked from being warped when standing in a warp while in a duel.
- Duels are now automatically ended when you warp out of the map you are in.


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

1 files changed, 2 insertions, 3 deletions

diff --git a/src/map/unit.c b/src/map/unit.c
index a9384eca9..cda650a63 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1700,6 +1700,8 @@ int unit_remove_map(struct block_list *bl, int clrtype)
 			sd->pvp_timer = -1;
 			sd->pvp_rank = 0;
 		}
+		if(sd->duel_group > 0)
+			duel_leave(sd->duel_group, sd);
 
 		if(pc_issit(sd)) {
 			pc_setstand(sd);
@@ -1807,9 +1809,6 @@ int unit_free(struct block_list *bl, int clrtype)
 
 		if (sd->followtimer != -1)
 			pc_stop_following(sd);
-		// Force exiting from duel and rejecting all duel invitations when player quit [LuzZza]
-		if(sd->duel_group > 0)
-			duel_leave(sd->duel_group, sd);
 			
 		if(sd->duel_invite > 0)
 			duel_reject(sd->duel_invite, sd);