From a04643e90516b061da29b2c6e6caceeae8ea62a9 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Mon, 23 Oct 2023 18:41:38 +0700
Subject: [PATCH] Fix inventory change trigger search tree NPE

---
 .../triggers/MatteryInventoryChangeTrigger.kt    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt
index 61b093e08..5cf93fd64 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt
@@ -71,7 +71,7 @@ object MatteryInventoryChangeTrigger : CriterionTrigger<InventoryChangeTrigger.T
 	private class Node<T>(
 		val strategy: Strategy<in T?>,
 		private val getter: InventoryChangeTrigger.TriggerInstance.() -> Collection<T>,
-		val test: Tester<T>,
+		val test: Tester<T?>, // if hint is present, tester is always going to be called with `null` value once
 		val hint: Hint<T>? = null
 	) {
 		fun getValues(instance: InventoryChangeTrigger.TriggerInstance): Set<T> {
@@ -84,9 +84,9 @@ object MatteryInventoryChangeTrigger : CriterionTrigger<InventoryChangeTrigger.T
 	private val nodes = ArrayList<Node<*>>()
 
 	init {
-		nodes.add(Node(BoundsStrategy, { listOf(slotsOccupied) }, { v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v.matches(slotsOccupied) }))
-		nodes.add(Node(BoundsStrategy, { listOf(slotsFull) }, { v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v.matches(slotsFull) }))
-		nodes.add(Node(BoundsStrategy, { listOf(slotsEmpty) }, { v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v.matches(slotsEmpty) }))
+		nodes.add(Node(BoundsStrategy, { listOf(slotsOccupied) }, { v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v!!.matches(slotsOccupied) }))
+		nodes.add(Node(BoundsStrategy, { listOf(slotsFull) }, { v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v!!.matches(slotsFull) }))
+		nodes.add(Node(BoundsStrategy, { listOf(slotsEmpty) }, { v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v!!.matches(slotsEmpty) }))
 
 		nodes.add(Node(
 			DefaultStrategy,
@@ -96,16 +96,16 @@ object MatteryInventoryChangeTrigger : CriterionTrigger<InventoryChangeTrigger.T
 
 		nodes.add(Node(
 			DefaultStrategy,
-			{ predicates.map { it.tag as Optional<TagKey<Item>> } },
-			{ v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v.isEmpty || item.`is`(v.get()) },
+			{ predicates.map { it.tag.orElse(null) } },
+			{ v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v == null || item.`is`(v) },
 			{ inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> item.tags.collect(Collectors.toCollection(::ArrayList)) }))
 
-		nodes.add(Node(BoundsStrategy, { predicates.map { it.count } }, { v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v.matches(item.count) }))
+		nodes.add(Node(BoundsStrategy, { predicates.map { it.count } }, { v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v!!.matches(item.count) }))
 
 		nodes.add(Node(
 			BoundsStrategy,
 			{ predicates.map { it.durability } },
-			{ v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v.isAny || item.isDamageableItem && v.matches(item.maxDamage - item.damageValue) }))
+			{ v, inventory: Container, item: ItemStack, slotsFull: Int, slotsEmpty: Int, slotsOccupied: Int -> v!!.isAny || item.isDamageableItem && v.matches(item.maxDamage - item.damageValue) }))
 	}
 
 	private class ListenerTree(private val advancements: PlayerAdvancements) {