diff options
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 10 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp | 36 |
2 files changed, 21 insertions, 25 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 9fdf3566571..9f687c6cfc4 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7217,13 +7217,6 @@ void Player::_ApplyItemMods(Item *item, uint8 slot,bool apply) if (!proto) return; - // don't apply/remove mods if the weapon is disarmed - if (item->GetSlot() == EQUIPMENT_SLOT_MAINHAND && HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISARMED)) - return; - - if (proto->Socket[0].Color) //only (un)equipping of items with sockets can influence metagems, so no need to waste time with normal items - CorrectMetaGemEnchants(slot, apply); - // not apply/remove mods for broken item if (item->IsBroken()) return; @@ -7236,6 +7229,9 @@ void Player::_ApplyItemMods(Item *item, uint8 slot,bool apply) if (!CanUseAttackType(attacktype)) return; + if (proto->Socket[0].Color) //only (un)equipping of items with sockets can influence metagems, so no need to waste time with normal items + CorrectMetaGemEnchants(slot, apply); + if (attacktype < MAX_ATTACK) _ApplyWeaponDependentAuraMods(item,WeaponAttackType(attacktype),apply); diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index b8b43291b35..2c9547955cb 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -25,14 +25,14 @@ enum eSpells SPELL_AWAKEN_VAULT_WALKER = 10258, }; -class instance_uldaman : public InstanceMapScript
-{
- public:
- instance_uldaman()
- : InstanceMapScript("instance_uldaman")
- {
- }
-
+class instance_uldaman : public InstanceMapScript +{ + public: + instance_uldaman() + : InstanceMapScript("instance_uldaman") + { + } + struct instance_uldaman_InstanceMapScript : public ScriptedInstance { instance_uldaman_InstanceMapScript(Map* pMap) : ScriptedInstance(pMap) @@ -289,14 +289,14 @@ class instance_uldaman : public InstanceMapScript return 0; } // end GetData64 }; -
- InstanceData* OnGetInstanceData(InstanceMap* pMap)
- {
- return new instance_uldaman_InstanceMapScript(pMap);
- }
-};
-
-void AddSC_instance_uldaman()
-{
- new instance_uldaman;
+ + InstanceData* OnGetInstanceData(InstanceMap* pMap) + { + return new instance_uldaman_InstanceMapScript(pMap); + } +}; + +void AddSC_instance_uldaman() +{ + new instance_uldaman; }
\ No newline at end of file |