DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix interact action not specifying entity id when originating from Lua

Browse Source
This commit is contained in:
DBotThePony 2024-04-29 19:11:33 +07:00
parent 17c9664ee9
commit d1e478b6ef
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/WorldObject.kt
View File

@ -541,11 +541,11 @@ open class WorldObject(val config: Registry.Entry<ObjectDefinition>) : TileEntit
return InteractAction.NONE return InteractAction.NONE
else if (result[0] is ByteString) { else if (result[0] is ByteString) {
val decoded = (result[0] as ByteString).decode() val decoded = (result[0] as ByteString).decode()
return InteractAction(InteractAction.Type.entries.firstOrNull { it.jsonName == decoded } ?: throw NoSuchElementException("Unknown interaction action type $decoded!")) return InteractAction(InteractAction.Type.entries.firstOrNull { it.jsonName == decoded } ?: throw NoSuchElementException("Unknown interaction action type $decoded!"), entityID)
} else { } else {
val data = result[0] as Table val data = result[0] as Table
val decoded = (data[1L] as ByteString).decode() val decoded = (data[1L] as ByteString).decode()
return InteractAction(InteractAction.Type.entries.firstOrNull { it.jsonName == decoded } ?: throw NoSuchElementException("Unknown interaction action type $decoded!"), 0, toJsonFromLua(data[2L])) return InteractAction(InteractAction.Type.entries.firstOrNull { it.jsonName == decoded } ?: throw NoSuchElementException("Unknown interaction action type $decoded!"), entityID, toJsonFromLua(data[2L]))
} }
} }