From dff4bdc24f2e2bc2020d08b923fc2c693a40e718 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 8 Feb 2023 17:34:09 +0000 Subject: [PATCH] Added PetEvent --- .../kotlin/com/willfp/ecopets/api/event/PetEvent.kt | 7 +++++++ .../willfp/ecopets/api/event/PlayerPetExpGainEvent.kt | 11 +++++------ .../willfp/ecopets/api/event/PlayerPetLevelUpEvent.kt | 9 ++++----- 3 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PetEvent.kt diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PetEvent.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PetEvent.kt new file mode 100644 index 0000000..85927a5 --- /dev/null +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PetEvent.kt @@ -0,0 +1,7 @@ +package com.willfp.ecopets.api.event + +import com.willfp.ecopets.pets.Pet + +interface PetEvent { + val pet: Pet +} diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PlayerPetExpGainEvent.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PlayerPetExpGainEvent.kt index b50df98..38f8ef3 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PlayerPetExpGainEvent.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PlayerPetExpGainEvent.kt @@ -1,18 +1,17 @@ package com.willfp.ecopets.api.event -import org.bukkit.entity.Player import com.willfp.ecopets.pets.Pet -import org.bukkit.event.player.PlayerEvent -import org.bukkit.event.HandlerList -import com.willfp.ecopets.api.event.PlayerPetExpGainEvent +import org.bukkit.entity.Player import org.bukkit.event.Cancellable +import org.bukkit.event.HandlerList +import org.bukkit.event.player.PlayerEvent class PlayerPetExpGainEvent( who: Player, - val pet: Pet, + override val pet: Pet, var amount: Double, val isMultiply: Boolean -) : PlayerEvent(who), Cancellable { +) : PlayerEvent(who), Cancellable, PetEvent { private var cancelled = false override fun setCancelled(cancel: Boolean) { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PlayerPetLevelUpEvent.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PlayerPetLevelUpEvent.kt index 033af30..7f2d511 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PlayerPetLevelUpEvent.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/event/PlayerPetLevelUpEvent.kt @@ -1,16 +1,15 @@ package com.willfp.ecopets.api.event -import org.bukkit.entity.Player import com.willfp.ecopets.pets.Pet -import org.bukkit.event.player.PlayerEvent +import org.bukkit.entity.Player import org.bukkit.event.HandlerList -import com.willfp.ecopets.api.event.PlayerPetLevelUpEvent +import org.bukkit.event.player.PlayerEvent class PlayerPetLevelUpEvent( who: Player, - val pet: Pet, + override val pet: Pet, val level: Int -) : PlayerEvent(who) { +) : PlayerEvent(who), PetEvent { override fun getHandlers(): HandlerList { return handlerList }