From 96c657cbb5e1c9282911bb8b7b6f6239392ae07f Mon Sep 17 00:00:00 2001
From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com>
Date: Mon, 19 Feb 2024 15:40:02 +0100
Subject: Added GetFromSackAPI. #968

---
 src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/minion')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
index ddebeb7c4..d866ecc8d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt
@@ -16,6 +16,7 @@ import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NEUInternalName
 import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.PrimitiveItemStack
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraft.block.BlockChest
 import net.minecraft.client.Minecraft
@@ -44,9 +45,6 @@ class MinionXp {
         val timestamp: SimpleTimeMark = SimpleTimeMark.now()
     }
 
-    // TODO move to some other spot. This can be used at other features as well
-    private data class PrimitiveItemStack(val name: NEUInternalName, val stackSize: Int)
-
     private fun toPrimitiveItemStack(itemStack: ItemStack) =
         PrimitiveItemStack(itemStack.getInternalName(), itemStack.stackSize)
 
@@ -113,7 +111,7 @@ class MinionXp {
             val xp = xpInfoMap[name] ?: return@forEach
 
             // TODO add wisdom and temporary skill exp (Events) to calculation
-            val baseXp = xp.amount * item.stackSize
+            val baseXp = xp.amount * item.amount
             val xpAmount = if (MayorElection.isPerkActive("Derpy", "MOAR SKILLZ!!!")) {
                 baseXp * 1.5
             } else baseXp
-- 
cgit