curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-14 20:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: crafting an item could unequip any holding item

Browse Source
This commit is contained in:
minjaesong
2024-09-12 20:53:04 +09:00
parent ff16ca5b1a
commit 4a0f740e03
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/modulebasegame/gameactors/ActorInventory.kt
View File

@@ -74,11 +74,13 @@ class ActorInventory() : FixtureInventory() {
* e.g. re-assign after this operation */ * e.g. re-assign after this operation */
override fun remove(item: GameItem, count: Long): Long { override fun remove(item: GameItem, count: Long): Long {
return super.remove(item, count) { existingItem -> return super.remove(item, count) { existingItem ->
// unequip, if applicable // unequip, if applicable
actor.unequipItem(existingItem.itm) actor.unequipItem(existingItem.itm)
// also unequip on the quickslot // also unequip on the quickslot
actor.actorValue.getAsInt(AVKey.__PLAYER_QUICKSLOTSEL)?.let { actor.actorValue.getAsInt(AVKey.__PLAYER_QUICKSLOTSEL)?.let {
setQuickslotItem(it, null) if (quickSlot[it] != null && quickSlot[it] == existingItem.itm)
setQuickslotItem(it, null)
} }
} }
} }