mirror of
https://github.com/Auxilor/EcoMobs.git
synced 2025-12-19 15:09:17 +00:00
Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1c770e07e7 | ||
|
|
9a48077c9e | ||
|
|
553e006da3 | ||
|
|
c658decff0 | ||
|
|
3af948b712 | ||
|
|
81eeabef5e | ||
|
|
2efa705760 | ||
|
|
040c43f072 | ||
|
|
a3fc8569f9 | ||
|
|
a2eb10c1f2 | ||
|
|
a1fe7ffdc0 | ||
|
|
ebf26ae8ca | ||
|
|
10ce71bb08 | ||
|
|
5432d066b3 | ||
|
|
0a0d1d8764 | ||
|
|
5619859b42 | ||
|
|
c6a6fc4201 | ||
|
|
b4c81d7874 | ||
|
|
fb78e87bd0 | ||
|
|
fd4b3bcc76 | ||
|
|
f1d02cc3ba | ||
|
|
78135d7e72 | ||
|
|
ed0fd90df8 | ||
|
|
42af89c79a | ||
|
|
d453461eeb | ||
|
|
e4093a0fd5 |
@@ -38,7 +38,7 @@ allprojects {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("com.willfp:eco:6.53.0")
|
||||
compileOnly("com.willfp:eco:6.56.0")
|
||||
compileOnly("org.jetbrains:annotations:23.0.0")
|
||||
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
|
||||
}
|
||||
|
||||
@@ -42,11 +42,13 @@ class EcoBossesPlugin : LibreforgePlugin() {
|
||||
)
|
||||
}
|
||||
|
||||
override fun handleEnable() {
|
||||
override fun handleLoad() {
|
||||
Effects.register(EffectBossDropChanceMultiplier)
|
||||
Triggers.register(TriggerKillBoss)
|
||||
Triggers.register(TriggerSpawnBoss)
|
||||
}
|
||||
|
||||
override fun handleEnable() {
|
||||
registerHolderProvider { it.bossHolders }
|
||||
}
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#libreforge-updater
|
||||
#Wed Mar 29 15:47:17 BST 2023
|
||||
#Wed May 17 15:57:13 BST 2023
|
||||
kotlin.code.style=official
|
||||
libreforge-version=4.0.0
|
||||
version=9.0.0
|
||||
libreforge-version=4.13.1
|
||||
version=9.13.1
|
||||
|
||||
Reference in New Issue
Block a user