From 96560034ccf65db0e47a80750dfc7cdd32a40c90 Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Thu, 28 Mar 2024 01:32:45 -0400
Subject: [PATCH] Fix Remove Item not taking into account ignoreNBT and
 ignoreDamage

---
 .../npcs/scripted/entity/ScriptPlayer.java    | 51 +++++++++----------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
index 41777b778..dc161d2c6 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
@@ -464,34 +464,29 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
 	 * @param amount How many will be removed
 	 * @return Returns true if the items were removed succesfully. Returns false incase a bigger amount than what the player has was given
 	 */
-	public boolean removeItem(IItemStack item, int amount, boolean ignoreNBT, boolean ignoreDamage) {
-		int count = inventoryItemCount(item);
-		if(amount  > count)
-			return false;
-		else if(count == amount)
-			removeAllItems(item);
-		else{
-			for(int i = 0; i < player.inventory.mainInventory.length; i++){
-				ItemStack is = player.inventory.mainInventory[i];
-				if (is != null && NoppesUtilPlayer.compareItems(is, item.getMCItemStack(), ignoreDamage, ignoreNBT)) {
-					if(amount > is.stackSize){
-						player.inventory.mainInventory[i] = null;
-						amount -= is.stackSize;
-					}
-					else{
-						is.splitStack(amount);
-						break;
-					}
-				}
-			}
-		}
-		this.updatePlayerInventory();
-		return true;
-	}
-
-	public void removeAllItems(IItemStack item){
-		removeAllItems(item, true, true);
-	}
+    public boolean removeItem(IItemStack item, int amount, boolean ignoreNBT, boolean ignoreDamage) {
+        int count = inventoryItemCount(item,ignoreNBT,ignoreDamage);
+        if(amount > count) {
+            return false;
+        } else if(count == amount) {
+            removeAllItems(item, ignoreNBT, ignoreDamage);
+        } else {
+            for(int i = 0; i < player.inventory.mainInventory.length; i++) {
+                ItemStack is = player.inventory.mainInventory[i];
+                if (is != null && NoppesUtilPlayer.compareItems(is, item.getMCItemStack(), ignoreDamage, ignoreNBT)) {
+                    if(amount > is.stackSize){
+                        player.inventory.mainInventory[i] = null;
+                        amount -= is.stackSize;
+                    } else{
+                        is.splitStack(amount);
+                        break;
+                    }
+                }
+            }
+        }
+        this.updatePlayerInventory();
+        return true;
+    }
 
 	/**
 	 * @param item The item to be removed from the players inventory