From 93c6930f99ead7430adc0796483c42f86efdbab3 Mon Sep 17 00:00:00 2001 From: Playtester Date: Mon, 20 Oct 2014 19:58:22 +0200 Subject: [PATCH] Weapon endow removal updated - Now weapon endow effects will no longer be removed when unequipping / changing a shield (bugreport:1490) - Now weapon endow effects will be removed when dual wielding and unequipping / changing one of the two weapons --- src/map/pc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/map/pc.c b/src/map/pc.c index 6bc702fa33..efdbb1b218 100755 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -9413,8 +9413,8 @@ bool pc_unequipitem(struct map_session_data *sd,int n,int flag) { clif_unequipitemack(sd,n,sd->status.inventory[n].equip,1); - if((sd->status.inventory[n].equip & EQP_ARMS) && - sd->weapontype1 == 0 && sd->weapontype2 == 0 && (!sd->sc.data[SC_SEVENWIND] || sd->sc.data[SC_ASPERSIO])) //Check for seven wind (but not level seven!) + if((sd->status.inventory[n].equip & EQP_ARMS) && sd->inventory_data[n]->type == IT_WEAPON && //On weapon change (right and left hand) + (!sd->sc.data[SC_SEVENWIND] || sd->sc.data[SC_ASPERSIO])) //Check for seven wind (but not level seven!) skill_enchant_elemental_end(&sd->bl,SC_NONE); if(sd->status.inventory[n].equip & EQP_ARMOR) {