Merge pull request #11 from XiaoJie-150/master

小小修改一下判断格式化,修复扫到v5的时候需要jdk11导致报错,跟进taboolib版本至6.2.0-beta33
TabooLib · Nov 3, 2024 · b736b87 · b736b87
2 parents e440cb5 + 51ef6d8
commit b736b87
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group=ink.ptms.um
 version=1.1.1
-taboolib_version=6.2.0-beta20
+taboolib_version=6.2.0-beta33
diff --git a/project/common/src/main/kotlin/ink/ptms/um/skill/condition/BaseCondition.kt b/project/common/src/main/kotlin/ink/ptms/um/skill/condition/BaseCondition.kt
@@ -10,13 +10,9 @@ interface BaseCondition {
         @JvmStatic
         fun isSubclass(subclass: BaseCondition): Boolean {
             return when (subclass) {
-                is CasterCondition -> true
-                is EntityCondition -> true
-                is LocationCondition -> true
-                is SkillMetadataCondition -> true
-                is EntityComparisonCondition -> true
-                is SkillMetaComparisonCondition->true
-                is EntityLocationDistanceCondition -> true
+                is CasterCondition, is EntityCondition, is LocationCondition,
+                is SkillMetadataCondition, is EntityComparisonCondition,
+                is SkillMetaComparisonCondition, is EntityLocationDistanceCondition -> true
                 else -> false
             }
         }

diff --git a/project/implementation-v5/build.gradle.kts b/project/implementation-v5/build.gradle.kts
@@ -37,6 +37,6 @@ configure<JavaPluginExtension> {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "1.8"
     }
 }