mirror of
https://github.com/Auxilor/EcoMobs.git
synced 2025-12-19 15:09:17 +00:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78135d7e72 | ||
|
|
ed0fd90df8 | ||
|
|
42af89c79a | ||
|
|
d453461eeb | ||
|
|
e4093a0fd5 |
@@ -4,7 +4,7 @@ version = rootProject.version
|
|||||||
dependencies {
|
dependencies {
|
||||||
compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
|
compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
|
||||||
compileOnly("com.github.lokka30:LevelledMobs:3.1.4")
|
compileOnly("com.github.lokka30:LevelledMobs:3.1.4")
|
||||||
compileOnly("com.ticxo.modelengine:api:R3.1.5")
|
compileOnly("com.ticxo.modelengine:api:R3.1.6")
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.willfp.eco.core.display.Display
|
|||||||
import com.willfp.eco.core.display.DisplayModule
|
import com.willfp.eco.core.display.DisplayModule
|
||||||
import com.willfp.eco.core.display.DisplayPriority
|
import com.willfp.eco.core.display.DisplayPriority
|
||||||
import com.willfp.eco.core.fast.fast
|
import com.willfp.eco.core.fast.fast
|
||||||
|
import com.willfp.libreforge.SimpleProvidedHolder
|
||||||
import org.bukkit.entity.Player
|
import org.bukkit.entity.Player
|
||||||
import org.bukkit.inventory.ItemStack
|
import org.bukkit.inventory.ItemStack
|
||||||
|
|
||||||
@@ -26,7 +27,7 @@ class EggDisplay(
|
|||||||
val egg = itemStack.bossEgg ?: return
|
val egg = itemStack.bossEgg ?: return
|
||||||
|
|
||||||
val lines = egg.spawnConditions
|
val lines = egg.spawnConditions
|
||||||
.filterNot { it.isMet(player) }
|
.filterNot { it.isMet(player, SimpleProvidedHolder(egg)) }
|
||||||
.map { it.notMetLines.map { line -> Display.PREFIX + line } }
|
.map { it.notMetLines.map { line -> Display.PREFIX + line } }
|
||||||
.flatten()
|
.flatten()
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.willfp.ecobosses.spawn
|
|||||||
import com.willfp.ecobosses.EcoBossesPlugin
|
import com.willfp.ecobosses.EcoBossesPlugin
|
||||||
import com.willfp.ecobosses.bosses.bossEgg
|
import com.willfp.ecobosses.bosses.bossEgg
|
||||||
import com.willfp.ecobosses.events.BossSpawnEvent
|
import com.willfp.ecobosses.events.BossSpawnEvent
|
||||||
|
import com.willfp.libreforge.SimpleProvidedHolder
|
||||||
import org.bukkit.Bukkit
|
import org.bukkit.Bukkit
|
||||||
import org.bukkit.Location
|
import org.bukkit.Location
|
||||||
import org.bukkit.block.Container
|
import org.bukkit.block.Container
|
||||||
@@ -78,7 +79,7 @@ class SpawnEggHandler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (player != null) {
|
if (player != null) {
|
||||||
if (!boss.spawnConditions.areMet(player)) {
|
if (!boss.spawnConditions.areMet(player, SimpleProvidedHolder(boss))) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.willfp.eco.util.containsIgnoreCase
|
|||||||
import com.willfp.ecobosses.bosses.Bosses
|
import com.willfp.ecobosses.bosses.Bosses
|
||||||
import com.willfp.ecobosses.events.BossSpawnEvent
|
import com.willfp.ecobosses.events.BossSpawnEvent
|
||||||
import com.willfp.ecobosses.util.SpawnTotem
|
import com.willfp.ecobosses.util.SpawnTotem
|
||||||
|
import com.willfp.libreforge.SimpleProvidedHolder
|
||||||
import org.bukkit.Bukkit
|
import org.bukkit.Bukkit
|
||||||
import org.bukkit.Material
|
import org.bukkit.Material
|
||||||
import org.bukkit.block.Block
|
import org.bukkit.block.Block
|
||||||
@@ -54,7 +55,7 @@ class SpawnTotemHandler : Listener {
|
|||||||
|
|
||||||
val player = event.player
|
val player = event.player
|
||||||
|
|
||||||
if (!boss.spawnConditions.areMet(player)) {
|
if (!boss.spawnConditions.areMet(player, SimpleProvidedHolder(boss))) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#libreforge-updater
|
#libreforge-updater
|
||||||
#Wed Mar 29 15:47:17 BST 2023
|
#Mon Apr 03 17:49:46 BST 2023
|
||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
libreforge-version=4.0.0
|
libreforge-version=4.2.2
|
||||||
version=9.0.0
|
version=9.2.2
|
||||||
|
|||||||
Reference in New Issue
Block a user