Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Guilds/Guild.cpp src/server/game/Handlers/TradeHandler.cpp src/server/scripts/Commands/cs_modify.cpp src/server/scripts/Kalimdor/zone_durotar.cpp
This commit is contained in:
commit
ef5bc9c70a
41 files changed
+460
-128
No files matched your search
@@ -850,7 +850,7 @@ class spell_sha_lava_lash : public SpellScriptLoader
|
||||
|
||||
class spell_sha_lava_lash_SpellScript : public SpellScript
|
||||
{
|
||||
PrepareSpellScript(spell_sha_lava_lash_SpellScript)
|
||||
PrepareSpellScript(spell_sha_lava_lash_SpellScript);
|
||||
|
||||
bool Load() override
|
||||
{
|
||||
@@ -927,7 +927,7 @@ class spell_sha_lava_surge_proc : public SpellScriptLoader
|
||||
|
||||
class spell_sha_lava_surge_proc_SpellScript : public SpellScript
|
||||
{
|
||||
PrepareSpellScript(spell_sha_lava_surge_proc_SpellScript)
|
||||
PrepareSpellScript(spell_sha_lava_surge_proc_SpellScript);
|
||||
|
||||
bool Validate(SpellInfo const* /*spellInfo*/) override
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user