aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/Spell.cpp
diff options
context:
space:
mode:
authorRat <gmstreetrat@gmail.com>2011-11-23 20:23:04 +0100
committerRat <gmstreetrat@gmail.com>2011-11-23 20:23:04 +0100
commit47d0a7f3afbb25d26dec8721801b13d4392aaf1d (patch)
tree86b1d2c876d67fd855ac67d875210df4cdb95b43 /src/server/game/Spells/Spell.cpp
parent47e28a7576d089552bc3ebf3dddcb6d9bf3e69f6 (diff)
parent0eb193f2b416af7f34bd89641aec88d843c9197e (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Conflicts: src/server/game/DataStores/DBCStores.cpp src/server/game/DataStores/DBCfmt.h src/server/game/Server/Protocol/Opcodes.cpp
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
-rwxr-xr-xsrc/server/game/Spells/Spell.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 40b95d497b0..5589e7328b2 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -7028,7 +7028,7 @@ bool Spell::CallScriptEffectHandlers(SpellEffIndex effIndex, SpellEffectHandleMo
break;
default:
ASSERT(false);
- break;
+ return false;
}
(*scritr)->_PrepareScriptCall(hookType);
for (; effItr != effEndItr ; ++effItr)