Merge conflicts

Auxilor · Jan 6, 2024 · 2ca76d8 · 2ca76d8
1 parent 028e61b
commit 2ca76d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/src/main/kotlin/com/willfp/libreforge/slot/ItemHolderFinder.kt b/core/src/main/kotlin/com/willfp/libreforge/slot/ItemHolderFinder.kt
@@ -4,7 +4,6 @@ import com.willfp.libreforge.Dispatcher
 import com.willfp.libreforge.Holder
 import com.willfp.libreforge.HolderProvider
 import com.willfp.libreforge.ItemProvidedHolder
-import com.willfp.libreforge.ProvidedHolder
 import com.willfp.libreforge.TypedHolderProvider
 import com.willfp.libreforge.TypedProvidedHolder
 import com.willfp.libreforge.get

diff --git a/core/src/main/kotlin/com/willfp/libreforge/slot/SlotType.kt b/core/src/main/kotlin/com/willfp/libreforge/slot/SlotType.kt
@@ -18,6 +18,11 @@ abstract class SlotType(
      */
     abstract fun getItems(entity: LivingEntity): List<ItemStack>
 
+    /**
+     * Exists for backwards compatibility.
+     */
+    fun getItems(player: Player) = getItems(player as LivingEntity)
+
     /**
      * Get the slots that this slot type uses.
      */