diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt index f366f0aed..5bae57ac5 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt @@ -5,9 +5,10 @@ import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.OwnInventorItemUpdateEvent import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.features.bazaar.BazaarApi -import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName +import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull_new import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.NEUItems import net.minecraft.item.ItemStack import net.minecraft.network.play.server.S2FPacketSetSlot @@ -74,21 +75,21 @@ class OwnInventoryData { val diffWorld = System.currentTimeMillis() - LorenzUtils.lastWorldSwitch if (diffWorld < 3_000) return - val internalName = item.getInternalName() - if (internalName.startsWith("MAP-")) return + val internalName = item.getInternalNameOrNull_new() - val (_, amount) = NEUItems.getMultiplier(internalName) - if (amount > 1) return - - if (internalName == "") { + if (internalName == null) { LorenzUtils.debug("OwnInventoryData add is empty for: '$internalName'") return } + if (internalName.asString().startsWith("MAP-")) return + + val (_, amount) = NEUItems.getMultiplier(internalName) + if (amount > 1) return addMultiplier(internalName, add) } - private fun addMultiplier(internalName: String, amount: Int) { + private fun addMultiplier(internalName: NEUInternalName, amount: Int) { CollectionAPI.addFromInventory(internalName, amount) } }
\ No newline at end of file |
