This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp | |
index 86362bf..2c3aaa8 100755 | |
--- a/src/server/game/Spells/Auras/SpellAuras.cpp | |
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp | |
@@ -1062,6 +1062,17 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster, | |
case SPELLFAMILY_WARLOCK: | |
switch(GetId()) | |
{ | |
+ case 6358: // Seduction | |
+ if (!caster) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp | |
index f0b48a5..65c038e 100644 | |
--- a/src/server/scripts/Spells/spell_generic.cpp | |
+++ b/src/server/scripts/Spells/spell_generic.cpp | |
@@ -1359,6 +1359,51 @@ public: | |
} | |
}; | |
+enum PlayerBuffs | |
+{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp | |
index cc23879..774fe02 100755 | |
--- a/src/server/game/Entities/Unit/Unit.cpp | |
+++ b/src/server/game/Entities/Unit/Unit.cpp | |
@@ -11597,7 +11597,7 @@ bool Unit::IsImmunedToSpell(SpellInfo const* spellInfo) | |
{ | |
// State/effect immunities applied by aura expect full spell immunity | |
// Ignore effects with mechanic, they are supposed to be checked separately | |
- if (!spellInfo->Effects[i].Mechanic) | |
+ if (!spellInfo->Effects[i].Mechanic && spellInfo->Effects[i].Effect != SPELL_EFFECT_KNOCK_BACK && spellInfo->Effects[i].Effect != SPELL_EFFECT_KNOCK_BACK_DEST) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp | |
index 107e275..04666b8 100755 | |
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp | |
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp | |
@@ -172,7 +172,10 @@ void Vehicle::ApplyAllImmunities() | |
// Different immunities for vehicles goes below | |
switch (GetVehicleInfo()->m_ID) | |
{ | |
- case 160: | |
+ // code below prevents a bug with moveable cannons |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp | |
index 107e275..09232c5 100755 | |
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp | |
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp | |
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp | |
index b669f8f..064ac77 100755 | |
--- a/src/server/game/Spells/SpellMgr.cpp | |
+++ b/src/server/game/Spells/SpellMgr.cpp | |
@@ -3204,6 +3204,9 @@ void SpellMgr::LoadDbcDataCorrections() | |
case 53246: // Marked for Death (Rank 5) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp | |
index 3fd87cd..6cd4af0 100755 | |
--- a/src/server/game/Entities/Unit/Unit.cpp | |
+++ b/src/server/game/Entities/Unit/Unit.cpp | |
@@ -1584,7 +1584,7 @@ void Unit::CalcAbsorbResist(Unit* victim, SpellSchoolMask schoolMask, DamageEffe | |
// Magic damage, check for resists | |
if ((schoolMask & SPELL_SCHOOL_MASK_NORMAL) == 0) | |
{ | |
- float victimResistance = float(victim->GetResistance(GetFirstSchoolInMask(schoolMask))); | |
+ float victimResistance = float(victim->GetResistance(schoolMask)); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp | |
index e68adee..3a9472c 100755 | |
--- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp | |
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp | |
@@ -135,7 +135,7 @@ void BattlegroundIC::PostUpdateImpl(uint32 diff) | |
if (nodePoint[i].nodeState == NODE_STATE_CONTROLLED_A || | |
nodePoint[i].nodeState == NODE_STATE_CONTROLLED_H) | |
{ | |
- if (nodePoint[i].timer <= diff) | |
+ if (docksTimer <= diff) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h | |
index 4523397..877bf11 100755 | |
--- a/src/server/game/Entities/Unit/Unit.h | |
+++ b/src/server/game/Entities/Unit/Unit.h | |
@@ -53,7 +53,8 @@ enum SpellInterruptFlags | |
// See SpellAuraInterruptFlags for other values definitions | |
enum SpellChannelInterruptFlags | |
{ | |
- CHANNEL_FLAG_DELAY = 0x4000 | |
+ CHANNEL_INTERRUPT_FLAG_INTERRUPT = 0x08, // interrupt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h | |
index bbfe565..4523397 100755 | |
--- a/src/server/game/Entities/Unit/Unit.h | |
+++ b/src/server/game/Entities/Unit/Unit.h | |
@@ -44,8 +44,8 @@ enum SpellInterruptFlags | |
{ | |
SPELL_INTERRUPT_FLAG_MOVEMENT = 0x01, // why need this for instant? | |
SPELL_INTERRUPT_FLAG_PUSH_BACK = 0x02, // push back | |
- SPELL_INTERRUPT_FLAG_INTERRUPT = 0x04, // interrupt | |
- SPELL_INTERRUPT_FLAG_AUTOATTACK = 0x08, // enter combat |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp | |
index 83cecf7..2d263b2 100755 | |
--- a/src/server/game/Spells/SpellEffects.cpp | |
+++ b/src/server/game/Spells/SpellEffects.cpp | |
@@ -2237,6 +2237,13 @@ void Spell::EffectHeal(SpellEffIndex /*effIndex*/) | |
addhealth += damageAmount; | |
} | |
+ // Runic Healing Injector (heal increased by 25% for engineers - 3.2.0 patch change) | |
+ else if (m_spellInfo->Id == 67489) |
NewerOlder