Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4
Conflicts: .travis.yml cmake/macros/ConfigureBoost.cmake sql/base/auth_database.sql sql/base/characters_database.sql sql/base/dev/world_database.sql sql/updates/world/2015_03_21_00_world.sql src/server/game/Miscellaneous/Language.h src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellInfo.cpp src/server/scripts/Spells/spell_quest.cpp src/server/worldserver/Main.cpp
This commit is contained in:
commit
fd0ef7bfab
402 files changed
+2494
-366
No files matched your search
@@ -462,7 +462,7 @@ void WorldSession::HandleCancelAuraOpcode(WorldPacket& recvPacket)
|
||||
return;
|
||||
|
||||
// not allow remove spells with attr SPELL_ATTR0_CANT_CANCEL
|
||||
if (spellInfo->Attributes & SPELL_ATTR0_CANT_CANCEL)
|
||||
if (spellInfo->HasAttribute(SPELL_ATTR0_CANT_CANCEL))
|
||||
return;
|
||||
|
||||
// channeled spell case (it currently cast then)
|
||||
|
||||
Reference in new issue
Block a user