Merge branch '3.3.5' into 4.3.4
Conflicts: sql/base/auth_database.sql sql/updates/world/2015_08_29_00_world.sql sql/updates/world/2015_08_29_01_world.sql sql/updates/world/2015_08_30_00_world.sql sql/updates/world/2015_08_31_01_world.sql sql/updates/world/2015_09_02_00_world.sql sql/updates/world/2015_09_02_01_world.sql sql/updates/world/2015_09_02_04_world.sql sql/updates/world/2015_09_03_00_world.sql sql/updates/world/2015_09_03_01_world.sql sql/updates/world/2015_09_03_02_world.sql sql/updates/world/2015_09_03_03_world.sql sql/updates/world/2015_09_03_04_world.sql sql/updates/world/2015_09_03_06_world.sql sql/updates/world/2015_09_03_07_world.sql sql/updates/world/2015_09_03_08_world.sql sql/updates/world/2015_09_03_09_world.sql sql/updates/world/2015_09_03_10_world.sql sql/updates/world/2015_09_03_11_world.sql sql/updates/world/2015_09_04_00_world.sql sql/updates/world/2015_09_04_01_world.sql sql/updates/world/2015_09_04_02_world.sql sql/updates/world/2015_09_04_03_world.sql sql/updates/world/2015_09_07_00_world.sql sql/updates/world/2015_09_07_01_world.sql sql/updates/world/2015_09_07_02_world.sql sql/updates/world/2015_09_07_03_world.sql sql/updates/world/2015_09_07_04_world.sql sql/updates/world/2015_09_07_05_world.sql sql/updates/world/2015_09_08_00_world.sql src/common/Collision/Management/MMapManager.cpp src/common/Cryptography/Authentication/AuthCrypt.cpp src/common/Cryptography/Authentication/AuthCrypt.h src/common/Cryptography/HMACSHA1.cpp src/common/Cryptography/HMACSHA1.h src/server/CMakeLists.txt src/server/collision/CMakeLists.txt src/server/game/CMakeLists.txt src/server/game/Entities/Object/ObjectGuid.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Quests/QuestDef.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/World/World.cpp src/server/scripts/CMakeLists.txt src/server/scripts/Commands/cs_cheat.cpp src/server/scripts/Commands/cs_debug.cpp src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp src/server/scripts/EasternKingdoms/zone_hinterlands.cpp src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp src/server/scripts/Spells/spell_mage.cpp src/server/worldserver/CMakeLists.txt src/server/worldserver/Main.cpp
This commit is contained in:
commit
221f1405b6
252 files changed
+5466
-5950
No files matched your search
@@ -5604,7 +5604,9 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
case 40438:
|
||||
{
|
||||
// Shadow Word: Pain
|
||||
if (procSpell->SpellFamilyFlags[0] & 0x8000)
|
||||
if (!procSpell)
|
||||
return false;
|
||||
else if (procSpell->SpellFamilyFlags[0] & 0x8000)
|
||||
triggered_spell_id = 40441;
|
||||
// Renew
|
||||
else if (procSpell->SpellFamilyFlags[0] & 0x40)
|
||||
@@ -5645,7 +5647,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
// Priest T10 Healer 2P Bonus
|
||||
case 70770:
|
||||
// Flash Heal
|
||||
if (procSpell->SpellFamilyFlags[0] & 0x800)
|
||||
if (procSpell && procSpell->SpellFamilyFlags[0] & 0x800)
|
||||
{
|
||||
triggered_spell_id = 70772;
|
||||
SpellInfo const* blessHealing = sSpellMgr->GetSpellInfo(triggered_spell_id);
|
||||
@@ -5712,10 +5714,13 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
// Healing Touch (Dreamwalker Raiment set)
|
||||
case 28719:
|
||||
{
|
||||
// mana back
|
||||
basepoints0 = int32(CalculatePct(procSpell->ManaCost, 30));
|
||||
target = this;
|
||||
triggered_spell_id = 28742;
|
||||
if (procSpell)
|
||||
{
|
||||
// mana back
|
||||
basepoints0 = int32(CalculatePct(procSpell->ManaCost, 30));
|
||||
target = this;
|
||||
triggered_spell_id = 28742;
|
||||
}
|
||||
break;
|
||||
}
|
||||
// Healing Touch Refund (Idol of Longevity trinket)
|
||||
@@ -5738,8 +5743,10 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
{
|
||||
float chance;
|
||||
|
||||
if (!procSpell)
|
||||
return false;
|
||||
// Starfire
|
||||
if (procSpell->SpellFamilyFlags[0] & 0x4)
|
||||
else if (procSpell->SpellFamilyFlags[0] & 0x4)
|
||||
{
|
||||
triggered_spell_id = 40445;
|
||||
chance = 25.0f;
|
||||
@@ -5769,7 +5776,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
case 70723:
|
||||
{
|
||||
// Wrath & Starfire
|
||||
if ((procSpell->SpellFamilyFlags[0] & 0x5) && (procEx & PROC_EX_CRITICAL_HIT))
|
||||
if (procSpell && (procSpell->SpellFamilyFlags[0] & 0x5) && (procEx & PROC_EX_CRITICAL_HIT))
|
||||
{
|
||||
triggered_spell_id = 71023;
|
||||
SpellInfo const* triggeredSpell = sSpellMgr->GetSpellInfo(triggered_spell_id);
|
||||
@@ -5785,7 +5792,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
case 70664:
|
||||
{
|
||||
// Proc only from normal Rejuvenation
|
||||
if (procSpell->SpellVisual[0] != 32)
|
||||
if (!procSpell || procSpell->SpellVisual[0] != 32)
|
||||
return false;
|
||||
|
||||
Player* caster = ToPlayer();
|
||||
@@ -6153,7 +6160,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
case 67228:
|
||||
{
|
||||
// Lava Burst
|
||||
if (procSpell->SpellFamilyFlags[1] & 0x1000)
|
||||
if (procSpell && procSpell->SpellFamilyFlags[1] & 0x1000)
|
||||
{
|
||||
triggered_spell_id = 71824;
|
||||
SpellInfo const* triggeredSpell = sSpellMgr->GetSpellInfo(triggered_spell_id);
|
||||
@@ -6167,7 +6174,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
case 70808:
|
||||
{
|
||||
// Chain Heal
|
||||
if ((procSpell->SpellFamilyFlags[0] & 0x100) && (procEx & PROC_EX_CRITICAL_HIT))
|
||||
if (procSpell && (procSpell->SpellFamilyFlags[0] & 0x100) && (procEx & PROC_EX_CRITICAL_HIT))
|
||||
{
|
||||
triggered_spell_id = 70809;
|
||||
SpellInfo const* triggeredSpell = sSpellMgr->GetSpellInfo(triggered_spell_id);
|
||||
@@ -6364,10 +6371,10 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
if (dummySpell->Id == 61257)
|
||||
{
|
||||
// only for spells and hit/crit (trigger start always) and not start from self cast spells
|
||||
if (procSpell == 0 || !(procEx & (PROC_EX_NORMAL_HIT|PROC_EX_CRITICAL_HIT)) || this == victim)
|
||||
if (!procSpell || !(procEx & (PROC_EX_NORMAL_HIT|PROC_EX_CRITICAL_HIT)) || this == victim)
|
||||
return false;
|
||||
// Need snare or root mechanic
|
||||
if (!(procSpell->GetAllEffectsMechanicMask() & ((1<<MECHANIC_ROOT)|(1<<MECHANIC_SNARE))))
|
||||
if (procSpell && !(procSpell->GetAllEffectsMechanicMask() & ((1<<MECHANIC_ROOT)|(1<<MECHANIC_SNARE))))
|
||||
return false;
|
||||
triggered_spell_id = 61258;
|
||||
target = this;
|
||||
@@ -6382,7 +6389,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
|
||||
// Guard Dog
|
||||
case 201:
|
||||
{
|
||||
if (!victim)
|
||||
if (!victim || !procSpell)
|
||||
return false;
|
||||
|
||||
triggered_spell_id = 54445;
|
||||
|
||||
Reference in new issue
Block a user