warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Players casting is sometimes not disturbed (#1138)

Browse source
This commit is contained in:
mark1145 2022-08-17 15:17:39 +10:00 • committed by GitHub
parent 2ae762904f
commit 23ae7a3c26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Projects/UOContent/Spells/Base/Spell.cs
View file

@ -395,38 +395,31 @@ namespace Server.Spells
return;
}
if (!firstCircle && !Core.AOS && (this as MagerySpell)?.Circle == SpellCircle.First)
if (State == SpellState.None || !firstCircle && !Core.AOS && (this as MagerySpell)?.Circle == SpellCircle.First)
{
return;
}
var wasCasting = IsCasting; // Copy SpellState before resetting it to none
State = SpellState.None;
Caster.Spell = null;
if (State == SpellState.Casting)
{
OnDisturb(type, true);
OnDisturb(type, wasCasting);
if (wasCasting)
{
_castTimer?.Stop();
_animTimer?.Stop();
if (Core.AOS && Caster.Player && type == DisturbType.Hurt)
{
DoHurtFizzle();
}
Caster.NextSpellTime = Core.TickCount + (int)GetDisturbRecovery().TotalMilliseconds;
}
else if (State == SpellState.Sequencing)
else
{
OnDisturb(type, false);
Target.Cancel(Caster);
}
if (Core.AOS && Caster.Player && type == DisturbType.Hurt)
{
DoHurtFizzle();
}
if (Core.AOS && Caster.Player && type == DisturbType.Hurt)
{
DoHurtFizzle();
}
}