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

Fixes more potion throwing edge cases (#1852)

Browse source
This commit is contained in:
Kamron Batman 2024-07-03 18:04:03 -07:00 • committed by GitHub
parent cbaa349a87
commit ac3e4fcc97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 78 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,6 +57,8 @@ public abstract partial class BasePotion : Item, ICraftable, ICommodity
public virtual bool RequireFreeHand => true;
public virtual bool IsThrowablePotion => false;
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => Core.ML;
@ -144,9 +146,11 @@ public abstract partial class BasePotion : Item, ICraftable, ICommodity
return;
}
if (this is BaseExplosionPotion && Amount > 1)
var pot = this;
if (IsThrowablePotion && Amount > 1)
{
var pot = GetType().CreateInstance<BaseExplosionPotion>();
pot = GetType().CreateInstance<BasePotion>();
Amount--;
@ -158,13 +162,9 @@ public abstract partial class BasePotion : Item, ICraftable, ICommodity
{
pot.MoveToWorld(from.Location, from.Map);
}
}
pot.Drink(from);
}
else
{
Drink(from);
}
pot.Drink(from);
}
private void Deserialize(IGenericReader reader, int version)