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

fix: Fixes magical barrier NPE and an edge case (#2162)

Browse source
This commit is contained in:
Kamron Batman 2025-04-22 17:52:09 -07:00 • committed by GitHub
parent 47b03f5d62
commit 4e25c74cdf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Projects/UOContent/Mobiles/Abilities/MagicalBarrier.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
namespace Server.Mobiles;
@ -7,7 +8,7 @@ public class MagicalBarrier : MonsterAbility
{
private HashSet<Mobile> _inactiveField;
public bool HasField(Mobile source) => !_inactiveField.Contains(source);
public bool HasField(Mobile source) => _inactiveField?.Contains(source) != true;
public override MonsterAbilityType AbilityType => MonsterAbilityType.MagicalBarrier;
@ -17,17 +18,20 @@ public class MagicalBarrier : MonsterAbility
public override TimeSpan MinTriggerCooldown => TimeSpan.FromSeconds(10.0);
public override TimeSpan MaxTriggerCooldown => TimeSpan.FromSeconds(10.0);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static bool CanUseField(BaseCreature source) => source.Hits >= source.HitsMax * 9 / 10;
// Regeneration is subject to the cooldown, the rest are not.
public override bool CanTrigger(BaseCreature source, MonsterAbilityTrigger trigger) =>
trigger != MonsterAbilityTrigger.Think || base.CanTrigger(source, trigger);
public override void Trigger(MonsterAbilityTrigger trigger, BaseCreature source, Mobile target)
{
if (trigger == MonsterAbilityTrigger.Think && !source.IsHurt())
if (trigger == MonsterAbilityTrigger.Think)
{
var fieldUp = _inactiveField?.Remove(source) == true;
if (fieldUp)
if (CanUseField(source) && _inactiveField?.Remove(source) == true)
{
// Field going up!
source.FixedParticles(0, 10, 0, 0x2530, EffectLayer.Waist);
if (_inactiveField?.Count == 0)
@ -36,6 +40,15 @@ public class MagicalBarrier : MonsterAbility
}
}
}
else if (trigger is MonsterAbilityTrigger.TakeSpellDamage && !CanUseField(source))
{
_inactiveField ??= [];
if (_inactiveField.Add(source))
{
// TODO: message and effect when field turns down; cannot be verified on OSI due to a bug
source.FixedParticles(0x3735, 1, 30, 0x251F, EffectLayer.Waist);
}
}
base.Trigger(trigger, source, target);
}
@ -53,22 +66,13 @@ public class MagicalBarrier : MonsterAbility
public override void AlterSpellDamageFrom(BaseCreature source, Mobile target, ref int damage)
{
var canUseField = source.Hits >= source.HitsMax * 9 / 10;
// If we cannot use the field, deactivate it.
var fieldActive = canUseField ? HasField(source) : _inactiveField.Add(source);
if (!fieldActive)
if (!HasField(source))
{
damage = 0; // no spell damage when the field is down
// should there be an effect when spells nullifying is on?
source.FixedParticles(0, 10, 0, 0x2522, EffectLayer.Waist);
target.SendLocalizedMessage(1114359); // Your attack has no effect on the creature's armor.
}
else if (!canUseField)
{
// TODO: message and effect when field turns down; cannot be verified on OSI due to a bug
source.FixedParticles(0x3735, 1, 30, 0x251F, EffectLayer.Waist);
}
}
public override void Move(BaseCreature source, Direction d)