diff options
| author | megamage <none@none> | 2009-05-13 19:34:10 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-13 19:34:10 -0500 |
| commit | 22f34d1b74abef2a0b78b9b0b372d27501b67751 (patch) | |
| tree | c9969e5f9220c80264b988e5b97d88221fdc6330 | |
| parent | eaf0f7d44a5ecdf14c89fafdeca16607da745ca9 (diff) | |
| parent | 2797d699363396c215cf5ecd603f7fae56cbc39d (diff) | |
*Merge.
--HG--
branch : trunk
| -rw-r--r-- | sql/updates/1484_world.sql | 7 | ||||
| -rw-r--r-- | src/game/Player.cpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sql/updates/1484_world.sql b/sql/updates/1484_world.sql new file mode 100644 index 00000000000..54f08141dab --- /dev/null +++ b/sql/updates/1484_world.sql @@ -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'); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index b3aad430b32..4efb3703c1f 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -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(); |