Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
This commit is contained in:
Vincent-Michael committed 2014-09-27 05:23:46 +02:00
commit da91ae1f22
93 files changed
+2131 -827

No files matched your search

+3 -2
View File
@@ -219,14 +219,15 @@ class spell_sha_chain_heal : public SpellScriptLoader
{
PrepareSpellScript(spell_sha_chain_heal_SpellScript);
bool Load() override
public:
spell_sha_chain_heal_SpellScript()
{
firstHeal = true;
riptide = false;
amount = 0;
return true;
}
private:
void HandleHeal(SpellEffIndex /*effIndex*/)
{
if (firstHeal)