Bump to 18, fix region collision

Project-Cepi · Dec 20, 2021 · 64a7d56 · 64a7d56
1 parent 982ad4f
commit 64a7d56
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     // Apply the Kotlin JVM plugin to add support for Kotlin.
-    kotlin("jvm") version "1.5.31"
+    kotlin("jvm") version "1.6.0"
     id("com.github.johnrengelman.shadow") version "7.1.0"
     id("org.jetbrains.dokka") version "1.5.31"
     kotlin("plugin.serialization") version "1.4.21"
@@ -73,11 +73,11 @@ tasks {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_16
-    targetCompatibility = JavaVersion.VERSION_16
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
-tasks.withType<KotlinCompile> { kotlinOptions.jvmTarget = "16" }
+tasks.withType<KotlinCompile> { kotlinOptions.jvmTarget = "17" }
 val compileKotlin: KotlinCompile by tasks
 
 compileKotlin.kotlinOptions {

diff --git a/src/main/kotlin/world/cepi/region/api/Region.kt b/src/main/kotlin/world/cepi/region/api/Region.kt
@@ -191,8 +191,11 @@ data class Region(
     }
 }
 
-val Player.region: Region?
-    get() = this.getTag(regionTag)?.let { RegionProvider[it] }
+var Player.region: Region?
+    get() = getTag(regionTag)?.let { RegionProvider[it] }
+    set(value) {
+        value?.name?.let { setTag(regionTag, it) } ?: removeTag(regionTag)
+    }
 
 fun Player.refreshRegionBossBar() {
     if (region == null) {

diff --git a/src/main/kotlin/world/cepi/region/event/PlayerRegionHandler.kt b/src/main/kotlin/world/cepi/region/event/PlayerRegionHandler.kt
@@ -16,14 +16,18 @@ object PlayerRegionHandler {
         val newRegion = RegionProvider.regions.values
             .filter { it.instance.uniqueId == player.instance?.uniqueId }
             .filter { it.contains(newPosition) }
-            .maxByOrNull(Region::volume)
+            .minByOrNull(Region::volume)
 
         if (oldRegion == newRegion)
             return@with
 
         val regionEvent = PlayerRegionUpdateEvent(player, oldRegion, newRegion, player.position)
         Manager.globalEvent.call(regionEvent)
 
+        if (!regionEvent.isCancelled) {
+            player.region = newRegion
+        }
+
         event.isCancelled = regionEvent.isCancelled
     }
 }