Dont throw error on interact with unknown prefab

MineInAbyss · Sep 11, 2022 · 0154f15 · 0154f15
1 parent 5c8989e
commit 0154f15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/com/mineinabyss/looty/tracking/BukkitItemAssociations.kt b/src/main/kotlin/com/mineinabyss/looty/tracking/BukkitItemAssociations.kt
@@ -48,6 +48,6 @@ fun ItemStack.toGearyOrNull(player: Player): GearyEntity? {
     pdc.decode<UUID>()?.let { return globalContextMC.uuid2entity[it] }
 
     // If no UUID, try to read as a player-instanced item
-    val prefab = pdc.decodePrefabs().firstOrNull() ?: return null
-    return player.toGeary().get<PlayerItemCache>()?.getInstance(prefab.toEntity())
+    val prefab = pdc.decodePrefabs().firstOrNull()?.toEntityOrNull() ?: return null
+    return player.toGeary().get<PlayerItemCache>()?.getInstance(prefab)
 }