curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-16 00:26:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: NPE on item removal caused by scrolling

Browse Source
This commit is contained in:
minjaesong
2024-02-13 00:23:42 +09:00
parent 45b141fd57
commit 2b8497133e
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt
View File

@@ -119,8 +119,6 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
else else
smelter.changeFireboxItemCount(-addCount2) 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() itemListUpdateKeepCurrentFilter()
} }
else { else {
@@ -238,7 +236,6 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
getPlayerInventory().add(smelter.oreItem!!.itm, -removeCount2) getPlayerInventory().add(smelter.oreItem!!.itm, -removeCount2)
smelter.changeOreItemCount(removeCount2) smelter.changeOreItemCount(removeCount2)
} }
if (smelter.oreItem!!.qty == 0L) smelter.oreItem = null
itemListUpdateKeepCurrentFilter() itemListUpdateKeepCurrentFilter()
} }
else { else {
@@ -297,7 +294,6 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
getPlayerInventory().add(smelter.fireboxItem!!.itm, -removeCount2) getPlayerInventory().add(smelter.fireboxItem!!.itm, -removeCount2)
smelter.changeFireboxItemCount(removeCount2) smelter.changeFireboxItemCount(removeCount2)
} }
if (smelter.fireboxItem!!.qty == 0L) smelter.fireboxItem = null
itemListUpdateKeepCurrentFilter() itemListUpdateKeepCurrentFilter()
} }
else { else {
@@ -347,7 +343,6 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
getPlayerInventory().add(smelter.productItem!!.itm, -removeCount2) getPlayerInventory().add(smelter.productItem!!.itm, -removeCount2)
smelter.changeProductItemCount(removeCount2) smelter.changeProductItemCount(removeCount2)
} }
if (smelter.productItem!!.qty == 0L) smelter.productItem = null
itemListUpdateKeepCurrentFilter() itemListUpdateKeepCurrentFilter()
} }
else { else {