Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld
# Conflicts: # src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp # src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp # src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
This commit is contained in:
commit
98fdf72c7b
1535 files changed
+2852
-2917
No files matched your search
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
|
||||
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
|
||||
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
@@ -3404,6 +3404,14 @@ void SpellMgr::LoadSpellInfoCorrections()
|
||||
spellInfo->Effects[EFFECT_0].TargetA = SpellImplicitTargetInfo(TARGET_UNIT_NEARBY_ENTRY);
|
||||
});
|
||||
|
||||
ApplySpellFix({
|
||||
19503, // Scatter Shot
|
||||
34490 // Silencing Shot
|
||||
}, [](SpellInfo* spellInfo)
|
||||
{
|
||||
spellInfo->Speed = 0.f;
|
||||
});
|
||||
|
||||
// Safeguard
|
||||
ApplySpellFix({
|
||||
46946, // (Rank 1)
|
||||
|
||||
Reference in new issue
Block a user