Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SE_TwinCastBlocker SPA 399 to also block twinproc #1476

Merged
merged 1 commit into from
Jul 29, 2021
Merged

Fix SE_TwinCastBlocker SPA 399 to also block twinproc #1476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions zone/mob.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3702,9 +3702,6 @@ void Mob::TryTwincast(Mob *caster, Mob *target, uint32 spell_id)
if(!IsValidSpell(spell_id))
return;

if (IsEffectInSpell(spell_id, SE_TwinCastBlocker))
return;

if(IsClient())
{
int32 focus = CastToClient()->GetFocusEffect(focusTwincast, spell_id);
Expand Down
4 changes: 2 additions & 2 deletions zone/spell_effects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4811,7 +4811,7 @@ int16 Client::CalcAAFocus(focusType type, const AA::Rank &rank, uint16 spell_id)
break;

case SE_FcTwincast:
if (type == focusTwincast)
if (type == focusTwincast && !IsEffectInSpell(spell_id, SE_TwinCastBlocker))
value = base1;
break;

Expand Down Expand Up @@ -5381,7 +5381,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo
break;

case SE_FcTwincast:
if (type == focusTwincast)
if (type == focusTwincast && !IsEffectInSpell(spell_id, SE_TwinCastBlocker))
value = focus_spell.base[i];
break;

Expand Down