From 39215935cf66054c5bd1a593e879b17f0ab38226 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Sat, 30 Mar 2024 09:52:40 -0700 Subject: [PATCH] fix: Fixes amount error spam from scissors (#1715) --- Projects/Server/Items/Item.cs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs index 4f0cb9daf..7a91d45b9 100644 --- a/Projects/Server/Items/Item.cs +++ b/Projects/Server/Items/Item.cs @@ -4121,28 +4121,18 @@ public class Item : IHued, IComparable, ISpawnable, IObjectPropertyListEnt } } - public virtual void ScissorHelper(Mobile from, Item newItem, int amountPerOldItem) - { - ScissorHelper(from, newItem, amountPerOldItem, true); - } - - public virtual void ScissorHelper(Mobile from, Item newItem, int amountPerOldItem, bool carryHue) + public virtual void ScissorHelper(Mobile from, Item newItem, int amountPerOldItem, bool carryHue = true) { // let's not go over 60000 var amount = Math.Min(Amount, 60000 / amountPerOldItem); - Amount -= amount; - var ourHue = Hue; var thisMap = Map; var thisParent = m_Parent; var worldLoc = GetWorldLocation(); var type = LootType; - if (Amount == 0) - { - Delete(); - } + Consume(amount); newItem.Amount = amount * amountPerOldItem;