pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 09:06:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bracket fix

Browse Source
This commit is contained in:
ProducerZekServer
2021-05-29 02:57:04 +00:00
committed by RoTPvP
parent 727a2cc0cc
commit 3deb3e0cad
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spells.cpp
+22 -2
View File
@@ -2044,12 +2044,32 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
if(!IsValidSpell(spell_id)) if(!IsValidSpell(spell_id))
return false; return false;
//Cazic Touch targets the pet owner instead of the pet when said pet is tanking. //Guard Assist Code
if (RuleB(Character, PVPEnableGuardFactionAssist) && IsDetrimentalSpell(spell_id) && spell_target != this) {
if (IsClient() || HasOwner() && GetOwner()->IsClient()) {
auto& mob_list = entity_list.GetCloseMobList(spell_target);
for (auto& e : mob_list) {
auto mob = e.second;
if (mob->IsNPC() && mob->CastToNPC()->IsGuard()) {
float distance = Distance(spell_target->GetPosition(), mob->GetPosition());
if ((mob->CheckLosFN(spell_target) || mob->CheckLosFN(this)) && distance <= 70) {
auto petorowner = this->GetOwnerOrSelf();
if (spell_target->GetReverseFactionCon(mob) <= petorowner->GetReverseFactionCon(mob)) {
mob->AddToHateList(this);
}
}
}
}
}
}
//Death Touch targets the pet owner instead of the pet when said pet is tanking.
if ((RuleB(Spells, CazicTouchTargetsPetOwner) && spell_target->HasOwner()) && spell_id == DB_SPELL_CAZIC_TOUCH || spell_id == DB_SPELL_TOUCH_OF_VINITRAS) { if ((RuleB(Spells, CazicTouchTargetsPetOwner) && spell_target->HasOwner()) && spell_id == DB_SPELL_CAZIC_TOUCH || spell_id == DB_SPELL_TOUCH_OF_VINITRAS) {
Mob* owner = spell_target->GetOwner(); Mob* owner = spell_target->GetOwner();
if (owner) if (owner) {
spell_target = owner; spell_target = owner;
}
} }
if( spells[spell_id].zonetype == 1 && !zone->CanCastOutdoor()){ if( spells[spell_id].zonetype == 1 && !zone->CanCastOutdoor()){