From cbbe5b590eac5dc2db78ec7a4d66a5f4bfb224ce Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 18 Jun 2022 10:54:54 +0100 Subject: [PATCH] Added getActivePet to API --- .../main/kotlin/com/willfp/ecopets/EcoPetsAPIImpl.kt | 3 +++ .../main/kotlin/com/willfp/ecopets/api/EcoPetsAPI.kt | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/EcoPetsAPIImpl.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/EcoPetsAPIImpl.kt index 608e088..f142c51 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/EcoPetsAPIImpl.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/EcoPetsAPIImpl.kt @@ -2,6 +2,7 @@ package com.willfp.ecopets import com.willfp.ecopets.api.EcoPetsAPI import com.willfp.ecopets.pets.Pet +import com.willfp.ecopets.pets.activePet import com.willfp.ecopets.pets.getPetLevel import com.willfp.ecopets.pets.getPetProgress import com.willfp.ecopets.pets.getPetXP @@ -14,6 +15,8 @@ import org.bukkit.entity.Player internal object EcoPetsAPIImpl : EcoPetsAPI { override fun hasPet(player: OfflinePlayer, pet: Pet) = player.hasPet(pet) + override fun getActivePet(player: OfflinePlayer): Pet? = player.activePet + override fun getPetLevel(player: OfflinePlayer, pet: Pet) = player.getPetLevel(pet) override fun givePetExperience(player: Player, pet: Pet, amount: Double) = diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/EcoPetsAPI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/EcoPetsAPI.kt index aadf1ff..8d1eabb 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/EcoPetsAPI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/api/EcoPetsAPI.kt @@ -18,6 +18,16 @@ interface EcoPetsAPI { pet: Pet ): Boolean + /** + * Get a player's active pet. + * + * @param player The player. + * @return The active pet. + */ + fun getActivePet( + player: OfflinePlayer + ): Pet? + /** * Get a player's level of a certain pet. *