diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs index bc8d9f773..ff886b9c9 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs @@ -1,6 +1,5 @@ using System; using ModernUO.Serialization; -using Server.Engines.ConPVP; using Server.Spells; namespace Server.Items; @@ -34,11 +33,6 @@ public abstract partial class BaseAgilityPotion : BasePotion if (DoAgility(from)) { PlayDrinkEffect(from); - - if (!DuelContext.IsFreeConsume(from)) - { - Consume(); - } } } } diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs index e01099fec..b395d41e1 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs @@ -174,7 +174,7 @@ public abstract partial class BasePotion : Item, ICraftable, ICommodity public abstract void Drink(Mobile from); - public static void PlayDrinkEffect(Mobile m) + public void PlayDrinkEffect(Mobile m) { m.RevealingAction(); @@ -182,6 +182,7 @@ public abstract partial class BasePotion : Item, ICraftable, ICommodity if (!DuelContext.IsFreeConsume(m)) { + Consume(); m.AddToBackpack(new Bottle()); } diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs index 0b14f0f77..40b66ae38 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs @@ -1,5 +1,4 @@ using ModernUO.Serialization; -using Server.Engines.ConPVP; using Server.Spells; using Server.Spells.Necromancy; @@ -71,11 +70,6 @@ public abstract partial class BaseCurePotion : BasePotion from.FixedParticles(0x373A, 10, 15, 5012, EffectLayer.Waist); from.PlaySound(0x1E0); - - if (!DuelContext.IsFreeConsume(from)) - { - Consume(); - } } else { diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs index 7828ac647..fa773b4f6 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs @@ -1,6 +1,5 @@ using System; using ModernUO.Serialization; -using Server.Engines.ConPVP; namespace Server.Items; @@ -50,11 +49,6 @@ public abstract partial class BaseHealPotion : BasePotion PlayDrinkEffect(from); - if (!DuelContext.IsFreeConsume(from)) - { - Consume(); - } - Timer.StartTimer(TimeSpan.FromSeconds(Delay), from.EndAction); } } diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs index 31d655978..b498a2986 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs @@ -28,7 +28,6 @@ public partial class InvisibilityPotion : BasePotion return; } - Consume(); Timer.StartTimer(TimeSpan.FromSeconds(2), () => Hide(from), out var timerToken); m_Table[from] = timerToken; PlayDrinkEffect(from); diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/NightSight.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/NightSight.cs index 1711a7ecf..e7e68549b 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/NightSight.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/NightSight.cs @@ -1,5 +1,4 @@ using ModernUO.Serialization; -using Server.Engines.ConPVP; namespace Server.Items; @@ -22,11 +21,6 @@ public partial class NightSightPotion : BasePotion from.PlaySound(0x1E3); PlayDrinkEffect(from); - - if (!DuelContext.IsFreeConsume(from)) - { - Consume(); - } } else { diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs index 1fddd3791..d24916590 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs @@ -1,5 +1,4 @@ using ModernUO.Serialization; -using Server.Engines.ConPVP; namespace Server.Items; @@ -25,10 +24,5 @@ public abstract partial class BasePoisonPotion : BasePotion DoPoison(from); PlayDrinkEffect(from); - - if (!DuelContext.IsFreeConsume(from)) - { - Consume(); - } } } diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs index 410f8d9e4..528ee2e0b 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs @@ -1,5 +1,4 @@ using ModernUO.Serialization; -using Server.Engines.ConPVP; namespace Server.Items; @@ -19,11 +18,6 @@ public abstract partial class BaseRefreshPotion : BasePotion from.Stam += Scale(from, (int)(Refresh * from.StamMax)); PlayDrinkEffect(from); - - if (!DuelContext.IsFreeConsume(from)) - { - Consume(); - } } else { diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs index 10b49f679..dc6cdcef1 100644 --- a/Projects/UOContent/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs +++ b/Projects/UOContent/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs @@ -1,6 +1,5 @@ using System; using ModernUO.Serialization; -using Server.Engines.ConPVP; using Server.Spells; namespace Server.Items; @@ -34,11 +33,6 @@ public abstract partial class BaseStrengthPotion : BasePotion if (DoStrength(from)) { PlayDrinkEffect(from); - - if (!DuelContext.IsFreeConsume(from)) - { - Consume(); - } } } }