1.0.8

更新 TabooLib & 修复了min max 中坐标为同一个时检测不到的bug
YsGqHY · Nov 3, 2024 · 343fcfb · 343fcfb
1 parent 60d1eac
commit 343fcfb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 57 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,23 +1,21 @@
+import io.izzel.taboolib.gradle.*
+
 plugins {
     `java-library`
     `maven-publish`
-    id("io.izzel.taboolib") version "1.60"
+    id("io.izzel.taboolib") version "2.0.11"
     id("org.jetbrains.kotlin.jvm") version "1.8.22"
 }
 
 taboolib {
-    install("common")
-    install("common-5")
-    install("module-chat")
-    install("module-configuration")
-    install("module-navigation")
-    install("module-kether")
-    install("module-effect")
-    install("module-lang")
-    install("platform-bukkit")
-    install("expansion-command-helper")
-    classifier = null
-    version = "6.0.12-69"
+
+    env {
+        install(UNIVERSAL, BUKKIT_ALL, KETHER, NMS_UTIL, NAVIGATION, EXPANSION_JAVASCRIPT)
+    }
+
+    version {
+        taboolib = "6.1.2-beta11"
+    }
 }
 
 repositories {
@@ -46,25 +44,4 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 configure<JavaPluginConvention> {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-publishing {
-    repositories {
-        maven {
-            url = uri("https://repo.tabooproject.org/repository/releases")
-            credentials {
-                username = project.findProperty("taboolibUsername").toString()
-                password = project.findProperty("taboolibPassword").toString()
-            }
-            authentication {
-                create<BasicAuthentication>("basic")
-            }
-        }
-    }
-    publications {
-        create<MavenPublication>("library") {
-            from(components["java"])
-            groupId = project.group.toString()
-        }
-    }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 group=kim.hhhhhy.regions
-version=1.0.7
+version=1.0.8
diff --git a/src/main/kotlin/kim/hhhhhy/regions/data/AreaSettings.kt b/src/main/kotlin/kim/hhhhhy/regions/data/AreaSettings.kt
@@ -10,10 +10,8 @@ import org.bukkit.Location
 import org.bukkit.entity.Player
 import taboolib.module.navigation.BoundingBox
 import taboolib.common.platform.function.console
-import taboolib.common.platform.function.info
 import taboolib.common.platform.function.submit
 import taboolib.common.platform.service.PlatformExecutor
-import taboolib.common5.mirrorNow
 import taboolib.module.configuration.Config
 import taboolib.module.configuration.Configuration
 import taboolib.module.lang.sendInfo
@@ -68,39 +66,34 @@ data class AreaSettings(
                 .filter { (_, area) ->
                     val pos = area.position
                     val isSameWorld = pos.world == worldName
-                    isSameWorld && BoundingBox(
+                    val box = BoundingBox(
                         min(pos.xMin, pos.xMax), min(pos.yMin, pos.yMax), min(pos.zMin, pos.zMax),
                         max(pos.xMin, pos.xMax), max(pos.yMin, pos.yMax), max(pos.zMin, pos.zMax)
-                    ).contains(x, y, z)
+                    )
+                    isSameWorld && x >= box.minX && x <= box.maxX && y >= box.minY && y <= box.maxY && z >= box.minZ && z <= box.maxZ
                 }
                 .map { (key, _) -> key }
         }
 
         private fun runEnterAction(player: Player, id: String) {
-            mirrorNow("RegionActionsLite:Actions:Enter") {
-                val actions = areasData[id]?.actions?.enter
-                if (ConfigSettings.baffleCache.hasNext("${player.name}-Enter-$id").not()) {
-                    return@mirrorNow
-                }
-                actions?.evalKether(player)
-                startTick(player, id)
+            val actions = areasData[id]?.actions?.enter
+            if (ConfigSettings.baffleCache.hasNext("${player.name}-Enter-$id").not()) {
+                return
             }
+            actions?.evalKether(player)
+            startTick(player, id)
         }
         private fun runLeaveAction(player: Player, id: String) {
-            mirrorNow("RegionActionsLite:Actions:Leave") {
-                val actions = areasData[id]?.actions?.leave
-                if (ConfigSettings.baffleCache.hasNext("${player.name}-Leave-$id").not()) {
-                    return@mirrorNow
-                }
-                actions?.evalKether(player)
-                stopTick(player, id)
+            val actions = areasData[id]?.actions?.leave
+            if (ConfigSettings.baffleCache.hasNext("${player.name}-Leave-$id").not()) {
+                return
             }
+            actions?.evalKether(player)
+            stopTick(player, id)
         }
         private fun runTickAction(player: Player, id: String) {
-            mirrorNow("RegionActionsLite:Actions:Tick") {
-                val actions = areasData[id]?.actions?.tick
-                actions?.evalKether(player)
-            }
+            val actions = areasData[id]?.actions?.tick
+            actions?.evalKether(player)
         }
 
         private fun startTick(player: Player, id: String) {