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

fix: Cleans up some comments and spell code (#1120)

Browse source
This commit is contained in:
Kamron Batman 2022-07-16 19:45:41 -07:00 • committed by GitHub
parent 56c97ca84a
commit fa3515f930
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 338 additions and 469 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/UOContent/Mobiles/BaseCreature.cs
View file

@ -1325,7 +1325,7 @@ namespace Server.Mobiles
amount = (int)(amount * BonusPetDamageScalar);
}
if (EvilOmenSpell.TryEndEffect(this))
if (EvilOmenSpell.EndEffect(this))
{
amount = (int)(amount * 1.25);
}
@ -1385,7 +1385,7 @@ namespace Server.Mobiles
return ApplyPoisonResult.Immune;
}
if (EvilOmenSpell.TryEndEffect(this))
if (EvilOmenSpell.EndEffect(this))
{
poison = PoisonImpl.IncreaseLevel(poison);
}

13
Projects/UOContent/Mobiles/PlayerMobile.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using Server.Accounting;
using Server.Collections;
using Server.ContextMenus;
using Server.Engines.BulkOrders;
using Server.Engines.ConPVP;
@ -2716,19 +2717,19 @@ namespace Server.Mobiles
if (m_BuffTable != null)
{
var list = new List<BuffInfo>();
using var queue = PooledRefQueue<BuffInfo>.Create();
foreach (var buff in m_BuffTable.Values)
{
if (!buff.RetainThroughDeath)
{
list.Add(buff);
queue.Enqueue(buff);
}
}
for (var i = 0; i < list.Count; i++)
while (queue.Count > 0)
{
RemoveBuff(list[i]);
RemoveBuff(queue.Dequeue());
}
}
}
@ -2838,7 +2839,7 @@ namespace Server.Mobiles
public override void Damage(int amount, Mobile from = null, bool informMount = true)
{
if (EvilOmenSpell.TryEndEffect(this))
if (EvilOmenSpell.EndEffect(this))
{
amount = (int)(amount * 1.25);
}
@ -4132,7 +4133,7 @@ namespace Server.Mobiles
return ApplyPoisonResult.Immune;
}
if (EvilOmenSpell.TryEndEffect(this))
if (EvilOmenSpell.EndEffect(this))
{
poison = PoisonImpl.IncreaseLevel(poison);
}