From 6fb5fce4d309161dcaf2fa6f2a77543e62c5c4cd Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Fri, 5 Jul 2024 19:15:43 -0500
Subject: [PATCH] fixed profit error for NPCs

---
 src/engine/net/client/ClientMessagePump.java | 16 ++++++++++++----
 src/engine/objects/Warehouse.java            |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java
index 781e3c04..d66c2558 100644
--- a/src/engine/net/client/ClientMessagePump.java
+++ b/src/engine/net/client/ClientMessagePump.java
@@ -1351,6 +1351,14 @@ public class ClientMessagePump implements NetMsgHandler {
 
         NPC npc = NPC.getFromCache(msg.getNpcID());
 
+
+        switch(npc.getContractID()){
+            case 900:
+            case 1201:
+            case 1202:
+                npc.sellPercent = 0.0f;
+                break;
+        }
         if (npc == null)
             return;
 
@@ -1411,7 +1419,7 @@ public class ClientMessagePump implements NetMsgHandler {
                                     bargain = 0;
                                     break;
                                 case 900:
-                                    cost = (int)(Warehouse.getCostForResource(ib.getUUID()) * Warehouse.getSellStackSize(ib.getUUID()) * 0.5f);
+                                    cost = Warehouse.getCostForResource(ib.getUUID()) * Warehouse.getSellStackSize(ib.getUUID());
                                     bargain = 0;
                                     break;
                             }
@@ -1440,7 +1448,7 @@ public class ClientMessagePump implements NetMsgHandler {
                                 return;
                             }
                             if(me.getItemBase().getType().equals(ItemType.RESOURCE) && npc.getContractID() == 900){
-                                handleResourcePurchase(me,itemMan,npc,buy,sourcePlayer,ib);
+                                handleResourcePurchase(me,itemMan,sourcePlayer,ib);
                             }else {
                                 buy = Item.createItemForPlayer(sourcePlayer, ib);
                                 if (buy != null) {
@@ -1556,7 +1564,7 @@ public class ClientMessagePump implements NetMsgHandler {
         }
     }
 
-    public static void handleResourcePurchase(MobEquipment me, CharacterItemManager itemMan, NPC npc, Item buy, PlayerCharacter sourcePlayer, ItemBase ib){
+    public static void handleResourcePurchase(MobEquipment me, CharacterItemManager itemMan, PlayerCharacter sourcePlayer, ItemBase ib){
         boolean stacked = false;
         int buystack = Warehouse.getSellStackSize(me.getItemBase().getUUID());
         for(Item item : itemMan.getInventory()){
@@ -1576,7 +1584,7 @@ public class ClientMessagePump implements NetMsgHandler {
             }
         }
         if(!stacked){
-            buy = Item.createItemForPlayer(sourcePlayer, ib);
+            Item buy = Item.createItemForPlayer(sourcePlayer, ib);
             if (buy != null) {
                 me.transferEnchants(buy);
                 itemMan.addItemToInventory(buy);
diff --git a/src/engine/objects/Warehouse.java b/src/engine/objects/Warehouse.java
index 29208f4c..b42ff1e4 100644
--- a/src/engine/objects/Warehouse.java
+++ b/src/engine/objects/Warehouse.java
@@ -356,7 +356,7 @@ public class Warehouse extends AbstractWorldObject {
     public static int getSellStackSize(int id){
         if(id == 1705032)
             return 10;
-        return (int)(3000000 / getCostForResource(id));
+        return 3000000 / getCostForResource(id);
     }
 
     public ConcurrentHashMap<ItemBase, Integer> getResources() {