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

fix: Fixes splitting potions before error (#1862)

Browse source 
### Summary

Most potions have various checks, such as a cooldown. This fixes an edge case where potions get split from their stack before erroring.
This commit is contained in:
Kamron Batman 2024-07-06 16:39:47 -07:00 • committed by GitHub
parent e6bfc45228
commit 38731d98b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 169 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Projects/UOContent/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -22,12 +22,17 @@ public abstract partial class BaseConflagrationPotion : BasePotion
public override bool IsThrowablePotion => true;
public override void Drink(Mobile from)
public override bool CanDrink(Mobile from)
{
if (!base.CanDrink(from))
{
return false;
}
if (Core.AOS && (from.Paralyzed || from.Frozen || from.Spell?.IsCasting == true))
{
from.SendLocalizedMessage(1062725); // You can not use that potion while paralyzed.
return;
return false;
}
var delay = GetDelay(from);
@ -36,14 +41,14 @@ public abstract partial class BaseConflagrationPotion : BasePotion
{
// You cannot use that for another ~1_NUM~ ~2_TIMEUNITS~
from.SendLocalizedMessage(1072529, $"{delay}\t{(delay > 1 ? "seconds." : "second.")}");
return;
return false;
}
if ((from.Target as ThrowTarget)?.Potion == this)
{
return;
}
return (from.Target as ThrowTarget)?.Potion != this;
}
public override void Drink(Mobile from)
{
from.RevealingAction();
_users ??= [];