diff --git a/game/plugin/api/src/org/apollo/game/plugins/api/position.kt b/game/plugin/api/src/org/apollo/game/plugins/api/position.kt index ffd3534d..59e6d3de 100644 --- a/game/plugin/api/src/org/apollo/game/plugins/api/position.kt +++ b/game/plugin/api/src/org/apollo/game/plugins/api/position.kt @@ -2,8 +2,11 @@ package org.apollo.game.plugins.api import org.apollo.game.model.Position -// Support destructuring a Position into its components. - -operator fun Position.component1(): Int = x -operator fun Position.component2(): Int = y -operator fun Position.component3(): Int = height +/** + * Support destructuring a Position into its components. + */ +object Position { + operator fun Position.component1(): Int = x + operator fun Position.component2(): Int = y + operator fun Position.component3(): Int = height +} \ No newline at end of file diff --git a/game/plugin/areas/src/area.kt b/game/plugin/areas/src/area.kt index 3c53fb1c..a924ca44 100644 --- a/game/plugin/areas/src/area.kt +++ b/game/plugin/areas/src/area.kt @@ -2,9 +2,9 @@ package org.apollo.game.plugins.area import org.apollo.game.model.Position import org.apollo.game.model.entity.Player -import org.apollo.game.plugins.api.component1 -import org.apollo.game.plugins.api.component2 -import org.apollo.game.plugins.api.component3 +import org.apollo.game.plugins.api.Position.component1 +import org.apollo.game.plugins.api.Position.component2 +import org.apollo.game.plugins.api.Position.component3 /** * An area in the game world. diff --git a/game/plugin/cmd/src/teleport-cmd.plugin.kts b/game/plugin/cmd/src/teleport-cmd.plugin.kts index ba5a0709..712fb720 100644 --- a/game/plugin/cmd/src/teleport-cmd.plugin.kts +++ b/game/plugin/cmd/src/teleport-cmd.plugin.kts @@ -1,10 +1,11 @@ + import com.google.common.primitives.Ints import org.apollo.game.model.Position import org.apollo.game.model.entity.setting.PrivilegeLevel import org.apollo.game.plugin.util.command.valid_arg_length -import org.apollo.game.plugins.api.component1 -import org.apollo.game.plugins.api.component2 -import org.apollo.game.plugins.api.component3 +import org.apollo.game.plugins.api.Position.component1 +import org.apollo.game.plugins.api.Position.component2 +import org.apollo.game.plugins.api.Position.component3 /** * Sends the player's position.