From e4093a0fd527eec9450f593e63b00f93e8549dc3 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Wed, 29 Mar 2023 19:21:02 +0100
Subject: [PATCH] libreforge-updater

---
 .../main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt   | 3 ++-
 .../kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt    | 3 ++-
 .../kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt  | 3 ++-
 gradle.properties                                           | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt
index 2d78db1..64a23b9 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/bosses/EggDisplay.kt
@@ -5,6 +5,7 @@ import com.willfp.eco.core.display.Display
 import com.willfp.eco.core.display.DisplayModule
 import com.willfp.eco.core.display.DisplayPriority
 import com.willfp.eco.core.fast.fast
+import com.willfp.libreforge.SimpleProvidedHolder
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 
@@ -26,7 +27,7 @@ class EggDisplay(
         val egg = itemStack.bossEgg ?: return
 
         val lines = egg.spawnConditions
-            .filterNot { it.isMet(player) }
+            .filterNot { it.isMet(player, SimpleProvidedHolder(egg)) }
             .map { it.notMetLines.map { line -> Display.PREFIX + line } }
             .flatten()
 
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt
index d16777a..c698a6b 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnEggHandler.kt
@@ -3,6 +3,7 @@ package com.willfp.ecobosses.spawn
 import com.willfp.ecobosses.EcoBossesPlugin
 import com.willfp.ecobosses.bosses.bossEgg
 import com.willfp.ecobosses.events.BossSpawnEvent
+import com.willfp.libreforge.SimpleProvidedHolder
 import org.bukkit.Bukkit
 import org.bukkit.Location
 import org.bukkit.block.Container
@@ -78,7 +79,7 @@ class SpawnEggHandler(
         }
 
         if (player != null) {
-            if (!boss.spawnConditions.areMet(player)) {
+            if (!boss.spawnConditions.areMet(player, SimpleProvidedHolder(boss))) {
                 return false
             }
         }
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt
index bf6a62f..b89a906 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/spawn/SpawnTotemHandler.kt
@@ -4,6 +4,7 @@ import com.willfp.eco.util.containsIgnoreCase
 import com.willfp.ecobosses.bosses.Bosses
 import com.willfp.ecobosses.events.BossSpawnEvent
 import com.willfp.ecobosses.util.SpawnTotem
+import com.willfp.libreforge.SimpleProvidedHolder
 import org.bukkit.Bukkit
 import org.bukkit.Material
 import org.bukkit.block.Block
@@ -54,7 +55,7 @@ class SpawnTotemHandler : Listener {
 
                 val player = event.player
 
-                if (!boss.spawnConditions.areMet(player)) {
+                if (!boss.spawnConditions.areMet(player, SimpleProvidedHolder(boss))) {
                     return
                 }
 
diff --git a/gradle.properties b/gradle.properties
index 444be9c..5c0166d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 #libreforge-updater
-#Wed Mar 29 15:47:17 BST 2023
+#Wed Mar 29 19:21:02 BST 2023
 kotlin.code.style=official
-libreforge-version=4.0.0
-version=9.0.0
+libreforge-version=4.1.0
+version=9.1.0