sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2023-09-23 22:44:15 +08:00
parent e7ac00b586 fb1d356af9
commit 2dd1490c18
154 changed files with 7913 additions and 4858 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Spell.cpp
-17
View File
@@ -6088,23 +6088,6 @@ SpellCastResult Spell::CheckCast(bool strict)
// for effects of spells that have only one target
switch (m_spellInfo->Effects[i].Effect)
{
case SPELL_EFFECT_DUMMY:
{
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT)
{
// Raise Ally
if( m_spellInfo->Id == 61999 )
{
Unit* target = m_targets.GetUnitTarget();
if (!target)
return SPELL_FAILED_BAD_TARGETS;
if (target->IsAlive()) // not discovered attributeEx5?
return SPELL_FAILED_TARGET_NOT_DEAD;
}
}
break;
}
case SPELL_EFFECT_LEARN_SPELL:
{
if (m_caster->GetTypeId() != TYPEID_PLAYER)
src/server/game/Spells/SpellInfo.cpp
+1 -1
View File
@@ -1470,7 +1470,7 @@ SpellCastResult SpellInfo::CheckShapeshift(uint32 form) const
return SPELL_CAST_OK;
}
SpellCastResult SpellInfo::CheckLocation(uint32 map_id, uint32 zone_id, uint32 area_id, Player const* player /*= nullptr*/, bool strict /*= true*/) const
SpellCastResult SpellInfo::CheckLocation(uint32 map_id, uint32 zone_id, uint32 area_id, Player* player /*= nullptr*/, bool strict /*= true*/) const
{
// normal case
if (AreaGroupId > 0)
src/server/game/Spells/SpellInfo.h
+1 -1
View File
@@ -474,7 +474,7 @@ public:
bool IsAuraExclusiveBySpecificPerCasterWith(SpellInfo const* spellInfo) const;
SpellCastResult CheckShapeshift(uint32 form) const;
SpellCastResult CheckLocation(uint32 map_id, uint32 zone_id, uint32 area_id, Player const* player = nullptr, bool strict = true) const;
SpellCastResult CheckLocation(uint32 map_id, uint32 zone_id, uint32 area_id, Player* player = nullptr, bool strict = true) const;
SpellCastResult CheckTarget(Unit const* caster, WorldObject const* target, bool implicit = true) const;
SpellCastResult CheckExplicitTarget(Unit const* caster, WorldObject const* target, Item const* itemTarget = nullptr) const;
bool CheckTargetCreatureType(Unit const* target) const;
src/server/game/Spells/SpellInfoCorrections.cpp
+2 -8
View File
@@ -1530,8 +1530,8 @@ void SpellMgr::LoadSpellInfoCorrections()
spellInfo->ChannelInterruptFlags |= AURA_INTERRUPT_FLAG_MOVE;
});
// Debris
ApplySpellFix({ 36449 }, [](SpellInfo* spellInfo)
// Debris - Debris Visual
ApplySpellFix({ 36449, 30632 }, [](SpellInfo* spellInfo)
{
spellInfo->Attributes |= SPELL_ATTR0_AURA_IS_DEBUFF;
});
@@ -1542,12 +1542,6 @@ void SpellMgr::LoadSpellInfoCorrections()
spellInfo->AttributesEx3 |= SPELL_ATTR3_DOT_STACKING_RULE;
});
// Debris Visual
ApplySpellFix({ 30632 }, [](SpellInfo* spellInfo)
{
spellInfo->Effects[EFFECT_0].TargetB = SpellImplicitTargetInfo(TARGET_DEST_DYNOBJ_ALLY);
});
// Activate Sunblade Protecto
ApplySpellFix({ 46475, 46476 }, [](SpellInfo* spellInfo)
{