pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Spells] IsInvisSpell() Method + InvisRequireGroup Rule (#1453)

Browse Source 
* IsInvis() Method + InvisRequireGroup Rule

* Fixed issues with invis rule crashes

* Fixed issues with invis rule crashes

* Invis Require Group nullptr fix

* Invis Group Require Fix crash

* Fixes Self only Invis Crashes

* Formatting, reverse check order to prevent unnecessary processing

Co-authored-by: ProducerZekServer <go@away.com>
Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Gangsta
2021-08-01 18:44:06 -07:00
committed by GitHub
parent 0e7cfe96ef
commit bb3c918eac
4 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spells.cpp
+23
View File
@@ -431,6 +431,28 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
// ok now we know the target
casting_spell_targetid = target_id;
if (RuleB(Spells, InvisRequiresGroup) && IsInvisSpell(spell_id)) {
if (GetTarget() && GetTarget()->IsClient()) {
Client *spell_target = entity_list.GetClientByID(target_id);
if (spell_target && spell_target->GetID() != GetID()) {
if (!spell_target->IsGrouped()) {
InterruptSpell(spell_id);
Message(Chat::Red, "You cannot invis someone who is not in your group.");
return false;
}
else if (spell_target->IsGrouped()) {
Group *target_group = spell_target->GetGroup();
Group *my_group = GetGroup();
if (target_group && my_group && (target_group->GetID() != my_group->GetID())) {
InterruptSpell(spell_id);
Message(Chat::Red, "You cannot invis someone who is not in your group.");
return false;
}
}
}
}
}
// We don't get actual mana cost here, that's done when we consume the mana
if (mana_cost == -1)
mana_cost = spell.mana;
@@ -2786,6 +2808,7 @@ int Mob::CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caste
spell_id != 287 && spell_id != 601 && IsEffectInSpell(spell_id, SE_Illusion))
res = 10000; // ~16h override
res = mod_buff_duration(res, caster, target, spell_id);
LogSpells("Spell [{}]: Casting level [{}], formula [{}], base_duration [{}]: result [{}]",