From 610d796302ef7502546e75429c7cfd0f437ff565 Mon Sep 17 00:00:00 2001
From: Gabriel Tofvesson <contact@w1zzrd.dev>
Date: Sun, 10 Oct 2021 16:27:15 +0200
Subject: [PATCH] Teleportation by command should place sender at specified
 portal, not its link

---
 src/main/kotlin/Comparator.kt      |  1 -
 src/main/kotlin/MultiSortedList.kt |  2 --
 src/main/kotlin/PortalCommand.kt   | 19 ++++++++++++-------
 src/main/kotlin/PortalManager.kt   |  3 ---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/kotlin/Comparator.kt b/src/main/kotlin/Comparator.kt
index 85f9fd1..0710464 100644
--- a/src/main/kotlin/Comparator.kt
+++ b/src/main/kotlin/Comparator.kt
@@ -2,7 +2,6 @@ import org.bukkit.Location
 import org.bukkit.OfflinePlayer
 import org.bukkit.World
 import java.util.*
-import kotlin.Comparator
 
 typealias Comparison<V> = (V) -> Int
 typealias Cooldown = Pair<OfflinePlayer, Long>
diff --git a/src/main/kotlin/MultiSortedList.kt b/src/main/kotlin/MultiSortedList.kt
index f3e57eb..2c3063b 100644
--- a/src/main/kotlin/MultiSortedList.kt
+++ b/src/main/kotlin/MultiSortedList.kt
@@ -1,6 +1,4 @@
 import java.util.*
-import kotlin.Comparator
-import kotlin.collections.ArrayList
 
 class MultiSortedList<E> constructor(
     underlying: MutableList<E>,
diff --git a/src/main/kotlin/PortalCommand.kt b/src/main/kotlin/PortalCommand.kt
index 671d0a4..55731e2 100644
--- a/src/main/kotlin/PortalCommand.kt
+++ b/src/main/kotlin/PortalCommand.kt
@@ -136,6 +136,8 @@ class PortalCommand(
         .branch(PermissionParseBranch(permissionInfoOther, constantParseNode("info"), PARSE_NODE_PLAYER, otherPortalParseNode))                                 //  portals info [owner] [name]
         .branch(PermissionParseBranch(permissionEdit, false, constantParseNode("edit"), senderPortalParseNode, constantParseNode("yaw"), PARSE_NODE_DECIMAL))   //  portals edit [name] yaw [number]
         .branch(PermissionParseBranch(permissionEdit, false, constantParseNode("edit"), senderPortalParseNode, constantParseNode("pitch"), PARSE_NODE_DECIMAL)) //  portals edit [name] pitch [number]
+        .branch(PermissionParseBranch(permissionEdit, false, constantParseNode("edit"), senderPortalParseNode, constantParseNode("yaw")))                       //  portals edit [name] yaw
+        .branch(PermissionParseBranch(permissionEdit, false, constantParseNode("edit"), senderPortalParseNode, constantParseNode("pitch")))                     //  portals edit [name] pitch
 
     override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
         when (val result = portalParse.getMatch(args, sender)) {
@@ -261,7 +263,7 @@ class PortalCommand(
                         }
 
                     "tp" -> {
-                        portalManager.teleportPlayerTo(sender as Player, result.match.last() as Portal)
+                        (result.match.last() as Portal).teleportPlayerTo(sender as Player)
                         null
                     }
 
@@ -283,17 +285,20 @@ class PortalCommand(
                     }
 
                     "edit" -> {
-                        val value = result.match.last() as Double
+                        val isExplicit = result.match.last() is Double
+                        val last = if (isExplicit) result.match.last() as Double else null
                         val portal = result.match[result.match.size - 3] as Portal
 
-                        when(result.match[result.match.size - 2] as String) {
+                        sender as Player
+
+                        when(result.match[result.match.lastIndex - (if (isExplicit) 1 else 0)] as String) {
                             "yaw" -> {
-                                portal.yaw = value.toFloat()
-                                RESULT_SUCCESS_EDIT_YAW.format(value)
+                                portal.yaw = if(isExplicit) last!!.toFloat() else sender.location.yaw
+                                RESULT_SUCCESS_EDIT_YAW.format(portal.yaw)
                             }
                             "pitch" -> {
-                                portal.pitch = value.toFloat()
-                                RESULT_SUCCESS_EDIT_PITCH.format(value)
+                                portal.pitch = if(isExplicit) last!!.toFloat() else sender.location.pitch
+                                RESULT_SUCCESS_EDIT_PITCH.format(portal.pitch)
                             }
                             else -> RESULT_ERROR_UNKNOWN
                         }
diff --git a/src/main/kotlin/PortalManager.kt b/src/main/kotlin/PortalManager.kt
index ccd2187..e3df870 100644
--- a/src/main/kotlin/PortalManager.kt
+++ b/src/main/kotlin/PortalManager.kt
@@ -1,5 +1,3 @@
-import net.md_5.bungee.api.chat.TextComponent
-import org.bukkit.Bukkit
 import org.bukkit.Location
 import org.bukkit.OfflinePlayer
 import org.bukkit.configuration.ConfigurationSection
@@ -13,7 +11,6 @@ import org.bukkit.plugin.Plugin
 import java.lang.Long.max
 import java.util.*
 import java.util.logging.Logger
-import kotlin.collections.HashMap
 
 private const val PATH_DATA_PLAYERS = "players"
 private const val PATH_DATA_WORLDS = "worlds"