From 68c6201d23a6e835e749d97a78167744b6ee64ba Mon Sep 17 00:00:00 2001
From: Gabriel Tofvesson <gabto095@student.liu.se>
Date: Sat, 30 Oct 2021 20:35:26 +0200
Subject: [PATCH] Fix rotation compression and accessing portals of offline
 players

---
 build.gradle.kts              |  6 +++++-
 src/main/kotlin/Numbers.kt    |  7 +++++++
 src/main/kotlin/Portal.kt     | 20 ++++++++++++++------
 src/main/kotlin/UUIDMapper.kt |  2 +-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 548fd58..a3be860 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "dev.w1zzrd"
-version = "1.0-SNAPSHOT"
+version = "1.0.1"
 
 repositories {
     mavenCentral()
@@ -29,6 +29,10 @@ tasks.getByName<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>("compileKotlin"
     }
 }
 
+tasks.getByName<CopySpec>("prepareSpigot") {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
 tasks.getByName<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>("compileTestKotlin") {
     kotlinOptions {
         jvmTarget = "16"
diff --git a/src/main/kotlin/Numbers.kt b/src/main/kotlin/Numbers.kt
index ab5a382..0c9d981 100644
--- a/src/main/kotlin/Numbers.kt
+++ b/src/main/kotlin/Numbers.kt
@@ -4,6 +4,8 @@ import java.math.MathContext
 import java.nio.ByteBuffer
 import java.util.*
 
+private const val ROTATION_COMPRESS_COEFF = 11_930_464.7083
+private const val PITCH_COMPRESS_COEFF = 23_860_929.4167
 internal val ULONG_MAX_INTEGER = BigInteger(byteArrayOf(0, 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte()))
 internal val ULONG_MAX_FLOAT = ULONG_MAX_INTEGER.toBigDecimal(mathContext = MathContext.UNLIMITED)
 
@@ -109,6 +111,11 @@ val Int.varIntSize get() = toLong().interlace().varIntSize
 val Short.varIntSize get() = toLong().interlace().varIntSize
 val Char.varIntSize get() = code.varIntSize
 
+fun Float.toPackedRotationUInt() = (ROTATION_COMPRESS_COEFF * mod(360f)).toUInt()
+fun UInt.fromPackedRotationFloat() = (toDouble() / ROTATION_COMPRESS_COEFF).toFloat()
+fun Float.toPackedPitchUInt() = (PITCH_COMPRESS_COEFF * plus(90f).mod(180f)).toUInt()
+fun UInt.fromPackedPitchFloat() = (toDouble() / PITCH_COMPRESS_COEFF).minus(90.0).toFloat()
+
 fun Float.varIntSize(min: Float, max: Float) = toDouble().varIntSize(min.toDouble(), max.toDouble())
 fun Double.varIntSize(min: Double, max: Double) = BigDecimal(this).varIntSize(BigDecimal(min), BigDecimal(max))
 fun BigDecimal.varIntSize(min: BigDecimal, max: BigDecimal) =
diff --git a/src/main/kotlin/Portal.kt b/src/main/kotlin/Portal.kt
index 7504488..50674d8 100644
--- a/src/main/kotlin/Portal.kt
+++ b/src/main/kotlin/Portal.kt
@@ -125,8 +125,14 @@ class Portal private constructor(
 
     fun getAccessExclusionsSize() = _accessExclusions.size
     fun getAccessExclusion(index: Int) = toPlayerMapper(_accessExclusions[index])
-    fun addAccessExclusion(player: OfflinePlayer) = _accessExclusions.add(fromPlayerMapper(player))
-    fun removeAccessExclusion(player: OfflinePlayer) = _accessExclusions.remove(fromPlayerMapper(player))
+    fun addAccessExclusion(player: OfflinePlayer) {
+        _accessExclusions.add(fromPlayerMapper(player))
+        flags = PortalFlag.NO_EXCLUSIONS.unSetFlag(flags)
+    }
+    fun removeAccessExclusion(player: OfflinePlayer) {
+        _accessExclusions.remove(fromPlayerMapper(player))
+        flags = PortalFlag.NO_EXCLUSIONS.setFlag(flags)
+    }
     fun containsAccessExclusion(player: OfflinePlayer) = fromPlayerMapper(player) in _accessExclusions
 
     val owner: OfflinePlayer
@@ -171,11 +177,13 @@ class Portal private constructor(
 
     fun unlink() {
         link = null
+        flags = PortalFlag.LINKED.unSetFlag(flags)
     }
 
     fun link(portal: Portal): Boolean {
         if (this == portal) return false
         link = portal.id
+        flags = PortalFlag.LINKED.setFlag(flags)
         return true
     }
 
@@ -199,8 +207,8 @@ class Portal private constructor(
         buffer.packedInt = x
         buffer.packedInt = y
         buffer.packedInt = z
-        buffer.putPackedFloat(yaw.mod(360f), 0f, 360f)
-        buffer.putPackedFloat((pitch + 90f).mod(180f) - 90f, -90f, 90f)
+        buffer.packedUInt = yaw.toPackedRotationUInt()
+        buffer.packedUInt = pitch.toPackedPitchUInt()
         buffer.byte = flags
         if (PortalFlag.LINKED.isFlagSet(flags)) {
             val link = link!!
@@ -248,8 +256,8 @@ class Portal private constructor(
                 inputBuffer.packedInt,
                 inputBuffer.packedInt,
                 inputBuffer.packedInt,
-                inputBuffer.getPackedFloat(0f, 360f),
-                inputBuffer.getPackedFloat(0f, 360f),
+                inputBuffer.packedUInt.fromPackedRotationFloat(),
+                inputBuffer.packedUInt.fromPackedPitchFloat(),
                 run {
                     flags = inputBuffer.byte
                     return@run flags
diff --git a/src/main/kotlin/UUIDMapper.kt b/src/main/kotlin/UUIDMapper.kt
index 4234c93..1a042cf 100644
--- a/src/main/kotlin/UUIDMapper.kt
+++ b/src/main/kotlin/UUIDMapper.kt
@@ -66,7 +66,7 @@ open class UUIDMapper<T>(
 }
 
 class PlayerMapper(dataStore: ConfigurationSection, dataStorePath: String): UUIDMapper<OfflinePlayer>(
-    { Bukkit.getServer().getPlayer(this) },
+    { Bukkit.getServer().getOfflinePlayer(this) },
     OfflinePlayer::getUniqueId,
     dataStore,
     dataStorePath