Merge pull request #2 from YsGqHY/master

Bkm016 · web-flow · commit bd614e148f11 · 2023-11-05T16:27:30.000+08:00
[publish] beta 34 fix getTargetedEntity()
diff --git a/README.md b/README.md
@@ -9,5 +9,5 @@ taboolib{
     relocate("ink.ptms.um","xx.um")
 }
 
-taboo("ink.ptms:um:1.0.0-beta-33")
+taboo("ink.ptms:um:1.0.0-beta-34")
 ```
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group=ink.ptms.um
-version=1.0.0-beta-33
+version=1.0.0-beta-34
 taboolib_version=6.0.12-26
diff --git a/project/common/src/main/kotlin/ink/ptms/um/Mythic.kt b/project/common/src/main/kotlin/ink/ptms/um/Mythic.kt
@@ -53,7 +53,7 @@ interface Mythic {
      *
      * @param player 玩家
      */
-    fun getTargetedEntity(player: Player): LivingEntity
+    fun getTargetedEntity(player: Player): LivingEntity?
 
     /**
      * 释放技能
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
@@ -38,7 +38,7 @@ internal class Mythic4 : Mythic {
 
     override val isLegacy = true
 
-    override fun getTargetedEntity(player: Player): LivingEntity {
+    override fun getTargetedEntity(player: Player): LivingEntity? {
         return MythicUtil.getTargetedEntity(player)
     }
 
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
@@ -75,7 +75,7 @@ internal class Mythic5 : Mythic {
         return Skill5(api.skillManager.getMechanic(MythicLineConfigImpl.unparseBlock(skillLine)) ?: return null)
     }
 
-    override fun getTargetedEntity(player: Player): LivingEntity {
+    override fun getTargetedEntity(player: Player): LivingEntity? {
         return MythicUtil.getTargetedEntity(player)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ taboolib{`
`9`	`9`	`relocate("ink.ptms.um","xx.um")`
`10`	`10`	`}`
`11`	`11`
`12`		`-taboo("ink.ptms:um:1.0.0-beta-33")`
	`12`	`+taboo("ink.ptms:um:1.0.0-beta-34")`
`13`	`13`	```
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ interface Mythic {`
`53`	`53`	`*`
`54`	`54`	`* @param player 玩家`
`55`	`55`	`*/`
`56`		`- fun getTargetedEntity(player: Player): LivingEntity`
	`56`	`+ fun getTargetedEntity(player: Player): LivingEntity?`
`57`	`57`
`58`	`58`	`/**`
`59`	`59`	`* 释放技能`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ internal class Mythic4 : Mythic {`
`38`	`38`
`39`	`39`	`override val isLegacy = true`
`40`	`40`
`41`		`- override fun getTargetedEntity(player: Player): LivingEntity {`
	`41`	`+ override fun getTargetedEntity(player: Player): LivingEntity? {`
`42`	`42`	`return MythicUtil.getTargetedEntity(player)`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ internal class Mythic5 : Mythic {`
`75`	`75`	`return Skill5(api.skillManager.getMechanic(MythicLineConfigImpl.unparseBlock(skillLine)) ?: return null)`
`76`	`76`	`}`
`77`	`77`
`78`		`- override fun getTargetedEntity(player: Player): LivingEntity {`
	`78`	`+ override fun getTargetedEntity(player: Player): LivingEntity? {`
`79`	`79`	`return MythicUtil.getTargetedEntity(player)`
`80`	`80`	`}`
`81`	`81`