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

37
Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs
View file

@ -129,23 +129,11 @@ public abstract partial class BasePotion : Item, ICraftable, ICommodity
public override void OnDoubleClick(Mobile from)
{
if (!Movable)
if (!CanDrink(from))
{
return;
}
if (!from.InRange(GetWorldLocation(), 1))
{
from.SendLocalizedMessage(502138); // That is too far away for you to use
return;
}
if (RequireFreeHand && !HasFreeHand(from))
{
from.SendLocalizedMessage(502172); // You must have a free hand to drink a potion.
return;
}
var pot = this;
if (IsThrowablePotion && Amount > 1)
@ -172,12 +160,33 @@ public abstract partial class BasePotion : Item, ICraftable, ICommodity
_potionEffect = (PotionEffect)reader.ReadInt();
}
public virtual bool CanDrink(Mobile from)
{
if (!Movable)
{
return false;
}
if (!from.InRange(GetWorldLocation(), 1))
{
from.SendLocalizedMessage(502138); // That is too far away for you to use
return false;
}
if (RequireFreeHand && !HasFreeHand(from))
{
from.SendLocalizedMessage(502172); // You must have a free hand to drink a potion.
return false;
}
return true;
}
public abstract void Drink(Mobile from);
public void PlayDrinkEffect(Mobile m)
{
m.RevealingAction();
m.PlaySound(0x2D6);
if (!DuelContext.IsFreeConsume(m))