Repo-Mirror/EcoMobs
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoMobs.git synced 2025-12-23 08:59:31 +00:00
Code Issues Releases 1 Activity

Fixed migration issues

Browse Source
This commit is contained in:
Auxilor
2022-02-06 13:09:31 +00:00
parent 28c0162a5e
commit 8f12af5d49
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/EcoBossesPlugin.kt
View File

@@ -2,7 +2,7 @@ package com.willfp.ecobosses
import com.willfp.eco.core.command.impl.PluginCommand import com.willfp.eco.core.command.impl.PluginCommand
import com.willfp.eco.core.integrations.IntegrationLoader import com.willfp.eco.core.integrations.IntegrationLoader
import com.willfp.ecobosses.bosses.EcoBosses import com.willfp.ecobosses.bosses.Bosses
import com.willfp.ecobosses.bosses.bossHolders import com.willfp.ecobosses.bosses.bossHolders
import com.willfp.ecobosses.commands.CommandEcobosses import com.willfp.ecobosses.commands.CommandEcobosses
import com.willfp.ecobosses.config.EcoBossesYml import com.willfp.ecobosses.config.EcoBossesYml
@@ -31,7 +31,7 @@ class EcoBossesPlugin : LibReforgePlugin(525, 10635, "&9") {
} }
override fun handleReloadAdditional() { override fun handleReloadAdditional() {
logger.info(EcoBosses.values().size.toString() + " Bosses Loaded") logger.info(Bosses.values().size.toString() + " Bosses Loaded")
AutospawnHandler.startSpawning(this) AutospawnHandler.startSpawning(this)
} }

3
eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandGive.kt
View File

@@ -3,7 +3,6 @@ package com.willfp.ecobosses.commands
import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.command.impl.Subcommand import com.willfp.eco.core.command.impl.Subcommand
import com.willfp.ecobosses.bosses.Bosses import com.willfp.ecobosses.bosses.Bosses
import com.willfp.ecobosses.bosses.EcoBosses
import org.bukkit.Bukkit import org.bukkit.Bukkit
import org.bukkit.command.CommandSender import org.bukkit.command.CommandSender
import org.bukkit.entity.Player import org.bukkit.entity.Player
@@ -40,7 +39,7 @@ class CommandGive(plugin: EcoPlugin) : Subcommand(
return return
} }
val key = args[1] val key = args[1]
val boss = EcoBosses.getByName(key) val boss = Bosses.getByID(key)
if (boss?.spawnEgg == null) { if (boss?.spawnEgg == null) {
sender.sendMessage(plugin.langYml.getMessage("invalid-boss")) sender.sendMessage(plugin.langYml.getMessage("invalid-boss"))

3
eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/commands/CommandSpawn.kt
View File

@@ -3,7 +3,6 @@ package com.willfp.ecobosses.commands
import com.willfp.eco.core.command.impl.Subcommand import com.willfp.eco.core.command.impl.Subcommand
import com.willfp.ecobosses.EcoBossesPlugin import com.willfp.ecobosses.EcoBossesPlugin
import com.willfp.ecobosses.bosses.Bosses import com.willfp.ecobosses.bosses.Bosses
import com.willfp.ecobosses.bosses.EcoBosses
import com.willfp.ecobosses.events.BossSpawnEvent import com.willfp.ecobosses.events.BossSpawnEvent
import org.bukkit.Bukkit import org.bukkit.Bukkit
import org.bukkit.Location import org.bukkit.Location
@@ -28,7 +27,7 @@ class CommandSpawn(plugin: EcoBossesPlugin) : Subcommand(
} }
val bossName = args[0] val bossName = args[0]
val boss = EcoBosses.getByName(bossName.lowercase()) val boss = Bosses.getByID(bossName.lowercase())
if (boss == null) { if (boss == null) {
sender.sendMessage(plugin.langYml.getMessage("specify-boss")) sender.sendMessage(plugin.langYml.getMessage("specify-boss"))
return return

4
eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/lifecycle/DeathListeners.kt
View File

@@ -16,7 +16,7 @@ class DeathListeners : Listener {
fun handle(event: EntityDeathByEntityEvent) { fun handle(event: EntityDeathByEntityEvent) {
val boss = Bosses[event.victim] ?: return val boss = Bosses[event.victim] ?: return
boss.remove(BossLifecycle.KILL) boss.remove()
val deathEvent = BossKillEvent(boss, event.killer.tryAsPlayer(), event.deathEvent) val deathEvent = BossKillEvent(boss, event.killer.tryAsPlayer(), event.deathEvent)
Bukkit.getPluginManager().callEvent(deathEvent) Bukkit.getPluginManager().callEvent(deathEvent)
@@ -28,7 +28,7 @@ class DeathListeners : Listener {
fun handle(event: EntityDeathEvent) { fun handle(event: EntityDeathEvent) {
val boss = Bosses[event.entity] ?: return val boss = Bosses[event.entity] ?: return
boss.remove(BossLifecycle.KILL) boss.remove()
val deathEvent = BossKillEvent(boss, null, event) val deathEvent = BossKillEvent(boss, null, event)
Bukkit.getPluginManager().callEvent(deathEvent) Bukkit.getPluginManager().callEvent(deathEvent)

9
eco-core/core-plugin/src/main/kotlin/com/willfp/ecobosses/tick/LifespanTicker.kt
View File

@@ -1,14 +1,19 @@
package com.willfp.ecobosses.tick package com.willfp.ecobosses.tick
import com.willfp.ecobosses.lifecycle.BossLifecycle
import com.willfp.ecobosses.bosses.LivingEcoBoss import com.willfp.ecobosses.bosses.LivingEcoBoss
import com.willfp.ecobosses.lifecycle.BossLifecycle
class LifespanTicker : BossTicker { class LifespanTicker : BossTicker {
override fun tick(boss: LivingEcoBoss, tick: Int) { override fun tick(boss: LivingEcoBoss, tick: Int) {
val timeLeft = (boss.deathTime - System.currentTimeMillis()) / 1000.0 val timeLeft = (boss.deathTime - System.currentTimeMillis()) / 1000.0
if (timeLeft <= 0) { if (timeLeft <= 0) {
boss.remove(BossLifecycle.DESPAWN) boss.remove()
boss.boss.handleLifecycle(
BossLifecycle.DESPAWN,
boss.entity?.location ?: return,
boss.entity
)
} }
} }
} }