diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/ItemHandler.cpp | 2 | ||||
| -rw-r--r-- | src/game/Spell.cpp | 2 | ||||
| -rw-r--r-- | src/game/SpellAuras.cpp | 8 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp index 3b3a23acfce..6b896e502f9 100644 --- a/src/game/ItemHandler.cpp +++ b/src/game/ItemHandler.cpp @@ -1163,7 +1163,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data) if(i!=0 && !itemProto->Socket[i-1].Color && (i+1 >= MAX_GEM_SOCKETS || itemProto->Socket[i+1].Color)) return; - // ok, this is first not colored socket for item with prismatic socket + // ok, this is first not colored socket for item with prismatic socket } // tried to put normal gem in meta socket diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 9e195538e5f..0ede1f00e4d 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2286,7 +2286,7 @@ void Spell::handle_immediate() { //apply haste mods m_caster->ModSpellCastTime(m_spellInfo, duration); - // Apply duration mod + // Apply duration mod if(Player* modOwner = m_caster->GetSpellModOwner()) modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration); m_spellState = SPELL_STATE_CASTING; diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 7dd6ae246cd..0cf9c979c14 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -440,9 +440,9 @@ m_updated(false), m_isRemovedOnShapeLost(true), m_in_use(false) if(modOwner) modOwner->ApplySpellMod(GetId(), SPELLMOD_CHARGES, m_procCharges); - m_isRemovedOnShapeLost = (m_caster_guid==m_target->GetGUID() && + m_isRemovedOnShapeLost = (m_caster_guid==m_target->GetGUID() && m_spellProto->Stances && - !(m_spellProto->AttributesEx2 & SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT) && + !(m_spellProto->AttributesEx2 & SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT) && !(m_spellProto->Attributes & SPELL_ATTR_NOT_SHAPESHIFT)); } @@ -5893,7 +5893,7 @@ void Aura::PeriodicTick() Powers pt = m_target->getPowerType(); if(int32(pt) != m_modifier.m_miscvalue) return; - + if ( GetSpellProto()->AuraInterruptFlags & AURA_INTERRUPT_FLAG_NOT_SEATED ) { // eating anim @@ -5904,7 +5904,7 @@ void Aura::PeriodicTick() // cannibalize anim m_target->HandleEmoteCommand(EMOTE_STATE_CANNIBALIZE); } - + // Warrior talent, gain 1 rage every 3 seconds while in combat if(pt == POWER_RAGE && m_target->isInCombat()) m_target->ModifyPower(pt, m_modifier.m_amount*10/17); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 2d4ab514c72..979dba29c68 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7271" + #define REVISION_NR "7272" #endif // __REVISION_NR_H__ |