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

fix: Fixes various memory leaks and spells (#1786)

Browse source 
### Summary
- Fixes various memory leaks related to spells
- Fixes Spell Plague
- Added ability to determine if `sdi` should take effect for Spell Damage.
- Fixes animal form timer ticking non-stop while logged out.
This commit is contained in:
Kamron Batman 2024-05-21 19:44:42 -07:00 • committed by GitHub
parent 6747168db0
commit a552cf4138
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
51 changed files with 4164 additions and 4188 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -194,7 +194,10 @@ namespace Server.Spells
(m as BaseCreature)?.OnHarmfulSpell(Caster);
}
public virtual int GetNewAosDamage(int bonus, int dice, int sides, Mobile singleTarget)
public int GetNewAosDamage(int bonus, int dice, int sides, Mobile singleTarget) =>
GetNewAosDamage(bonus, dice, sides, true, singleTarget);
public virtual int GetNewAosDamage(int bonus, int dice, int sides, bool sdi = true, Mobile singleTarget = null)
{
if (singleTarget != null)
{
@ -203,17 +206,15 @@ namespace Server.Spells
dice,
sides,
Caster.Player && singleTarget.Player,
sdi,
GetDamageScalar(singleTarget)
);
}
return GetNewAosDamage(bonus, dice, sides, false);
return GetNewAosDamage(bonus, dice, sides, sdi, false);
}
public virtual int GetNewAosDamage(int bonus, int dice, int sides, bool playerVsPlayer) =>
GetNewAosDamage(bonus, dice, sides, playerVsPlayer, 1.0);
public virtual int GetNewAosDamage(int bonus, int dice, int sides, bool playerVsPlayer, double scalar)
public virtual int GetNewAosDamage(int bonus, int dice, int sides, bool playerVsPlayer, bool sdi, double scalar = 1.0)
{
var damage = Utility.Dice(dice, sides, bonus) * 100;
@ -224,14 +225,17 @@ namespace Server.Spells
var intBonus = Caster.Int / 10;
damageBonus += intBonus;
var sdiBonus = AosAttributes.GetValue(Caster, AosAttribute.SpellDamage);
// PvP spell damage increase cap of 15% from an item's magic property
if (playerVsPlayer && sdiBonus > 15)
if (sdi)
{
sdiBonus = 15;
}
var sdiBonus = AosAttributes.GetValue(Caster, AosAttribute.SpellDamage);
// PvP spell damage increase cap of 15% from an item's magic property
if (playerVsPlayer && sdiBonus > 15)
{
sdiBonus = 15;
}
damageBonus += sdiBonus;
damageBonus += sdiBonus;
}
var context = TransformationSpellHelper.GetContext(Caster);