diff options
author | Rat <gmstreetrat@gmail.com> | 2015-03-24 20:01:02 +0100 |
---|---|---|
committer | Rat <gmstreetrat@gmail.com> | 2015-03-24 20:01:02 +0100 |
commit | eebc468e628acc801a6426e03815150c8cfd9172 (patch) | |
tree | 2f269f7b97bd7fe83b8bfeb3240820521110f9aa /src/server/game/Spells/SpellEffects.cpp | |
parent | bc5ebe3d0599a08e93fd6d0a8c63c7e7cc43c35f (diff) | |
parent | 3ad7776d5061308d3e2b4ff9e3cbf67d48bffdd6 (diff) |
Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x
Conflicts:
src/server/collision/Management/MMapManager.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
-rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index fe86b623893..e2537461979 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -317,6 +317,12 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]= &Spell::EffectNULL, //242 SPELL_EFFECT_242 &Spell::EffectNULL, //243 SPELL_EFFECT_243 &Spell::EffectNULL, //244 SPELL_EFFECT_244 + &Spell::EffectNULL, //244 SPELL_EFFECT_245 + &Spell::EffectNULL, //244 SPELL_EFFECT_246 + &Spell::EffectNULL, //244 SPELL_EFFECT_247 + &Spell::EffectNULL, //244 SPELL_EFFECT_248 + &Spell::EffectNULL, //244 SPELL_EFFECT_249 + &Spell::EffectNULL, //244 SPELL_EFFECT_250 }; void Spell::EffectNULL(SpellEffIndex /*effIndex*/) @@ -3926,7 +3932,7 @@ void Spell::EffectStuck(SpellEffIndex /*effIndex*/) return; TC_LOG_DEBUG("spells", "Spell Effect: Stuck"); - TC_LOG_INFO("spells", "Player %s (%s) used auto-unstuck future at map %u (%f, %f, %f)", player->GetName().c_str(), player->GetGUID().ToString().c_str(), player->GetMapId(), player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); + TC_LOG_DEBUG("spells", "Player %s (%s) used auto-unstuck future at map %u (%f, %f, %f)", player->GetName().c_str(), player->GetGUID().ToString().c_str(), player->GetMapId(), player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()); if (player->IsInFlight()) return; |