AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 03:15:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

simple container action: commit action correctly

Browse Source
This commit is contained in:
Bixilon 2022-11-19 14:12:18 +01:00
parent d046c69574
commit ebb2e50387
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/bixilon/minosoft/data/container/click/SimpleContainerAction.kt
View File

@ -82,6 +82,7 @@ class SimpleContainerAction(
target.item._count -= subtract target.item._count -= subtract
floatingItem.item._count += subtract floatingItem.item._count += subtract
} }
target.commit(false)
if (floatingItem._valid) { if (floatingItem._valid) {
container.floatingItem = floatingItem container.floatingItem = floatingItem

4
src/main/java/de/bixilon/minosoft/data/container/stack/ItemStack.kt
View File

@ -198,11 +198,13 @@ class ItemStack {
lock.lock() lock.lock()
} }
fun commit() { fun commit(unlock: Boolean = true) {
if (!_valid) { if (!_valid) {
holder?.container?._validate() holder?.container?._validate()
} }
if (unlock) {
lock.unlock() lock.unlock()
}
revision++ revision++
holder?.container?.apply { revision++ } // increase revision after unlock to prevent deadlock holder?.container?.apply { revision++ } // increase revision after unlock to prevent deadlock
} }