From 2b8497133e79ed55f99dd99287c50672e679f2e8 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Tue, 13 Feb 2024 00:23:42 +0900 Subject: [PATCH] fix: NPE on item removal caused by scrolling --- src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt b/src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt index ba13164c2..5a17dc3cb 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt @@ -119,8 +119,6 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas( else smelter.changeFireboxItemCount(-addCount2) } - if (smelter.fireboxItem != null && smelter.fireboxItem!!.qty == 0L) smelter.fireboxItem = null - else if (smelter.fireboxItem != null && smelter.fireboxItem!!.qty < 0L) throw Error("Item removal count is larger than what was on the slot") itemListUpdateKeepCurrentFilter() } else { @@ -238,7 +236,6 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas( getPlayerInventory().add(smelter.oreItem!!.itm, -removeCount2) smelter.changeOreItemCount(removeCount2) } - if (smelter.oreItem!!.qty == 0L) smelter.oreItem = null itemListUpdateKeepCurrentFilter() } else { @@ -297,7 +294,6 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas( getPlayerInventory().add(smelter.fireboxItem!!.itm, -removeCount2) smelter.changeFireboxItemCount(removeCount2) } - if (smelter.fireboxItem!!.qty == 0L) smelter.fireboxItem = null itemListUpdateKeepCurrentFilter() } else { @@ -347,7 +343,6 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas( getPlayerInventory().add(smelter.productItem!!.itm, -removeCount2) smelter.changeProductItemCount(removeCount2) } - if (smelter.productItem!!.qty == 0L) smelter.productItem = null itemListUpdateKeepCurrentFilter() } else {