GabrielTofvesson/SpigotPortals
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Teleportation by command should place sender at specified portal, not its link

Browse Source
This commit is contained in:
Gabriel Tofvesson 2021-10-10 16:27:15 +02:00
parent 4510f2bfe3
commit 610d796302
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/kotlin/Comparator.kt
View File

@ -2,7 +2,6 @@ import org.bukkit.Location
import org.bukkit.OfflinePlayer import org.bukkit.OfflinePlayer
import org.bukkit.World import org.bukkit.World
import java.util.* import java.util.*
import kotlin.Comparator
typealias Comparison<V> = (V) -> Int typealias Comparison<V> = (V) -> Int
typealias Cooldown = Pair<OfflinePlayer, Long> typealias Cooldown = Pair<OfflinePlayer, Long>

2
src/main/kotlin/MultiSortedList.kt
View File

@ -1,6 +1,4 @@
import java.util.* import java.util.*
import kotlin.Comparator
import kotlin.collections.ArrayList
class MultiSortedList<E> constructor( class MultiSortedList<E> constructor(
underlying: MutableList<E>, underlying: MutableList<E>,

19
src/main/kotlin/PortalCommand.kt
View File

@ -136,6 +136,8 @@ class PortalCommand(
.branch(PermissionParseBranch(permissionInfoOther, constantParseNode("info"), PARSE_NODE_PLAYER, otherPortalParseNode)) // portals info [owner] [name] .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("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("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 { override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
when (val result = portalParse.getMatch(args, sender)) { when (val result = portalParse.getMatch(args, sender)) {
@ -261,7 +263,7 @@ class PortalCommand(
} }
"tp" -> { "tp" -> {
portalManager.teleportPlayerTo(sender as Player, result.match.last() as Portal) (result.match.last() as Portal).teleportPlayerTo(sender as Player)
null null
} }
@ -283,17 +285,20 @@ class PortalCommand(
} }
"edit" -> { "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 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" -> { "yaw" -> {
portal.yaw = value.toFloat() portal.yaw = if(isExplicit) last!!.toFloat() else sender.location.yaw
RESULT_SUCCESS_EDIT_YAW.format(value) RESULT_SUCCESS_EDIT_YAW.format(portal.yaw)
} }
"pitch" -> { "pitch" -> {
portal.pitch = value.toFloat() portal.pitch = if(isExplicit) last!!.toFloat() else sender.location.pitch
RESULT_SUCCESS_EDIT_PITCH.format(value) RESULT_SUCCESS_EDIT_PITCH.format(portal.pitch)
} }
else -> RESULT_ERROR_UNKNOWN else -> RESULT_ERROR_UNKNOWN
} }

3
src/main/kotlin/PortalManager.kt
View File

@ -1,5 +1,3 @@
import net.md_5.bungee.api.chat.TextComponent
import org.bukkit.Bukkit
import org.bukkit.Location import org.bukkit.Location
import org.bukkit.OfflinePlayer import org.bukkit.OfflinePlayer
import org.bukkit.configuration.ConfigurationSection import org.bukkit.configuration.ConfigurationSection
@ -13,7 +11,6 @@ import org.bukkit.plugin.Plugin
import java.lang.Long.max import java.lang.Long.max
import java.util.* import java.util.*
import java.util.logging.Logger import java.util.logging.Logger
import kotlin.collections.HashMap
private const val PATH_DATA_PLAYERS = "players" private const val PATH_DATA_PLAYERS = "players"
private const val PATH_DATA_WORLDS = "worlds" private const val PATH_DATA_WORLDS = "worlds"