Merge pull request #8 from YsGqHY/master

新增根据实体 UUID 获取 ActiveMob 实例
TabooLib · Jul 29, 2024 · 9c0c07e · 9c0c07e
2 parents 246db5e + a0601a3
commit 9c0c07e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/project/common/src/main/kotlin/ink/ptms/um/Mythic.kt b/project/common/src/main/kotlin/ink/ptms/um/Mythic.kt
@@ -6,6 +6,7 @@ import org.bukkit.entity.LivingEntity
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import java.io.File
+import java.util.*
 
 interface Mythic {
 
@@ -30,6 +31,9 @@ interface Mythic {
     /** 获取 ActiveMob 实例 */
     fun getMob(entity: Entity): Mob?
 
+    /** 根据实体 UUID 获取 ActiveMob 实例 */
+    fun getMob(uuid: UUID): Mob?
+
     /** 获取所有 Mob ID 列表 */
     fun getMobIDList(): List<String>
 

diff --git a/project/implementation-v4/src/main/kotlin/ink/ptms/um/impl4/Mythic4.kt b/project/implementation-v4/src/main/kotlin/ink/ptms/um/impl4/Mythic4.kt
@@ -1,6 +1,6 @@
 package ink.ptms.um.impl4
 
-import ink.ptms.um.Mythic
+import ink.ptms.um.*
 import ink.ptms.um.Skill
 import io.lumine.xikage.mythicmobs.MythicMobs
 import io.lumine.xikage.mythicmobs.io.MythicConfig
@@ -24,7 +24,9 @@ import taboolib.common.util.unsafeLazy
 import taboolib.library.reflex.Reflex.Companion.getProperty
 import taboolib.module.nms.getName
 import java.io.File
+import java.util.*
 import java.util.concurrent.ConcurrentHashMap
+import kotlin.jvm.optionals.getOrNull
 
 /**
  * universal-mythic ink.ptms.um.impl4.Mythic4
@@ -76,6 +78,10 @@ internal class Mythic4 : Mythic {
         return Mob(mobManager.getMythicMobInstance(entity) ?: return null)
     }
 
+    override fun getMob(uuid: UUID): ink.ptms.um.Mob? {
+        return Mob(mobManager.getActiveMob(uuid).getOrNull() ?: return null)
+    }
+
     override fun getMobIDList(): List<String> {
         return mobManager.mobNames.toList()
     }

diff --git a/project/implementation-v5/src/main/kotlin/ink/ptms/um/impl5/Mythic5.kt b/project/implementation-v5/src/main/kotlin/ink/ptms/um/impl5/Mythic5.kt
@@ -1,6 +1,6 @@
 package ink.ptms.um.impl5
 
-import ink.ptms.um.Mythic
+import ink.ptms.um.*
 import ink.ptms.um.Skill
 import io.lumine.mythic.api.MythicProvider
 import io.lumine.mythic.api.mobs.MythicMob
@@ -23,6 +23,8 @@ import taboolib.common.util.orNull
 import taboolib.library.reflex.Reflex.Companion.getProperty
 import taboolib.module.nms.getItemTag
 import java.io.File
+import java.util.*
+import kotlin.jvm.optionals.getOrNull
 
 /**
  * universal-mythic ink.ptms.um.impl4.Mythic4
@@ -63,6 +65,10 @@ internal class Mythic5 : Mythic {
         return Mob((MythicProvider.get().mobManager as MobExecutor).getMythicMobInstance(entity) ?: return null)
     }
 
+    override fun getMob(uuid: UUID): ink.ptms.um.Mob? {
+        return Mob((MythicProvider.get().mobManager as MobExecutor).getActiveMob(uuid).getOrNull() ?: return null)
+    }
+
     override fun getMobIDList(): List<String> {
         return api.mobManager.mobNames.toList()
     }