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

fix: Fixes explosion potions (#873)

Browse source 
* Fixes the users list not being cleared out
* Removes the LINQ allocations
This commit is contained in:
Kamron Batman 2021-12-04 11:31:52 -08:00 • committed by GitHub
parent 12255fd7a8
commit 08baf3c35d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Projects/UOContent/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -1,6 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using Server.Collections;
using Server.Network; using Server.Network;
using Server.Spells; using Server.Spells;
using Server.Targeting; using Server.Targeting;
@ -30,7 +30,7 @@ namespace Server.Items
public override bool RequireFreeHand => false; public override bool RequireFreeHand => false;
public List<Mobile> Users { get; private set; } private HashSet<Mobile> _users;
public override void Serialize(IGenericWriter writer) public override void Serialize(IGenericWriter writer)
{ {
@ -84,12 +84,8 @@ namespace Server.Items
from.RevealingAction(); from.RevealingAction();
Users ??= new List<Mobile>(); _users ??= new HashSet<Mobile>();
_users.Add(from);
if (!Users.Contains(from))
{
Users.Add(from);
}
from.Target = new ThrowTarget(this); from.Target = new ThrowTarget(this);
@ -195,65 +191,69 @@ namespace Server.Items
Consume(); Consume();
for (var i = 0; i < Users?.Count; ++i) foreach (var user in _users)
{ {
var m = Users[i]; if (user.Target is ThrowTarget targ && targ.Potion == this)
if (m.Target is ThrowTarget targ && targ.Potion == this)
{ {
Target.Cancel(m); Target.Cancel(user);
} }
} }
_users.Clear();
if (map == null) if (map == null)
{ {
return; return;
} }
Effects.PlaySound(loc, map, 0x307); Effects.PlaySound(loc, map, 0x307);
Effects.SendLocationEffect(loc, map, 0x36B0, 9); Effects.SendLocationEffect(loc, map, 0x36B0, 9);
var alchemyBonus = 0;
var alchemyBonus = 0;
if (direct) if (direct)
{ {
alchemyBonus = (int)(from.Skills.Alchemy.Value / (Core.AOS ? 5 : 10)); alchemyBonus = (int)(from.Skills.Alchemy.Value / (Core.AOS ? 5 : 10));
} }
var eable = map.GetObjectsInRange(loc, ExplosionRange, LeveledExplosion); var eable = map.GetObjectsInRange(loc, ExplosionRange, LeveledExplosion);
using var queue = PooledRefQueue<IEntity>.Create();
var toDamage = 0; var toDamage = 0;
foreach (var entity in eable)
{
if (entity == this)
{
continue;
}
var toExplode = eable.Where( if (entity is Mobile mobile)
o => {
if (from == null || SpellHelper.ValidIndirectTarget(from, mobile) && from.CanBeHarmful(mobile, false))
{ {
if (!(o is Mobile mobile) || from != null &&
(!SpellHelper.ValidIndirectTarget(from, mobile) || !from.CanBeHarmful(mobile, false)))
{
return o is BaseExplosionPotion && o != this;
}
++toDamage; ++toDamage;
return true; queue.Enqueue(entity);
} }
) }
.ToList(); else if (entity is BaseExplosionPotion)
{
queue.Enqueue(entity);
}
}
eable.Free(); eable.Free();
var min = Scale(from, MinDamage); var min = Scale(from, MinDamage);
var max = Scale(from, MaxDamage); var max = Scale(from, MaxDamage);
for (var i = 0; i < toExplode.Count; ++i) while (queue.Count > 0)
{ {
var o = toExplode[i]; var entity = queue.Dequeue();
if (o is Mobile m) if (entity is Mobile m)
{ {
from?.DoHarmful(m); from?.DoHarmful(m);
var damage = Utility.RandomMinMax(min, max); var damage = Utility.RandomMinMax(min, max) + alchemyBonus;
damage += alchemyBonus;
if (!Core.AOS && damage > 40) if (!Core.AOS && damage > 40)
{ {
@ -266,7 +266,7 @@ namespace Server.Items
AOS.Damage(m, from, damage, 0, 100, 0, 0, 0); AOS.Damage(m, from, damage, 0, 100, 0, 0, 0);
} }
else if (o is BaseExplosionPotion pot) else if (entity is BaseExplosionPotion pot)
{ {
pot.Explode(from, false, pot.GetWorldLocation(), pot.Map); pot.Explode(from, false, pot.GetWorldLocation(), pot.Map);
} }