*Merge.

--HG-- branch : trunk
2009-05-13 19:34:10 -05:00
parent eaf0f7d44a 2797d69936
commit 22f34d1b74
2 changed files with 9 additions and 2 deletions
@@ -0,0 +1,7 @@
+DELETE FROM `spell_affect` WHERE `entry` IN ('16513','16514','16515','16719','16720') AND `effectId`='2';
+INSERT INTO `spell_affect` VALUES 
+('16513', '2', '268558336'), 
+('16514', '2', '268558336'),
+('16515', '2', '268558336'),
+('16719', '2', '268558336'),
+('16720', '2', '268558336');
@@ -6441,8 +6441,8 @@ void Player::_ApplyItemMods(Item *item, uint8 slot,bool apply)
    if(slot >= INVENTORY_SLOT_BAG_END || !item)
        return;

-    // not apply/remove mods for broken item
-    if(item->IsBroken())
+    // not apply mods for broken item
+    if(item->IsBroken() && apply)
        return;

    ItemPrototype const *proto = item->GetProto();