Skip to content

Commit 9c4eff7

Browse files
committed
Move Position destructuring functions to their own object
1 parent 3c26d0a commit 9c4eff7

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

game/plugin/api/src/org/apollo/game/plugins/api/position.kt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ package org.apollo.game.plugins.api
22

33
import org.apollo.game.model.Position
44

5-
// Support destructuring a Position into its components.
6-
7-
operator fun Position.component1(): Int = x
8-
operator fun Position.component2(): Int = y
9-
operator fun Position.component3(): Int = height
5+
/**
6+
* Support destructuring a Position into its components.
7+
*/
8+
object Position {
9+
operator fun Position.component1(): Int = x
10+
operator fun Position.component2(): Int = y
11+
operator fun Position.component3(): Int = height
12+
}

game/plugin/areas/src/area.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package org.apollo.game.plugins.area
22

33
import org.apollo.game.model.Position
44
import org.apollo.game.model.entity.Player
5-
import org.apollo.game.plugins.api.component1
6-
import org.apollo.game.plugins.api.component2
7-
import org.apollo.game.plugins.api.component3
5+
import org.apollo.game.plugins.api.Position.component1
6+
import org.apollo.game.plugins.api.Position.component2
7+
import org.apollo.game.plugins.api.Position.component3
88

99
/**
1010
* An area in the game world.

game/plugin/cmd/src/teleport-cmd.plugin.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
12
import com.google.common.primitives.Ints
23
import org.apollo.game.model.Position
34
import org.apollo.game.model.entity.setting.PrivilegeLevel
45
import org.apollo.game.plugin.util.command.valid_arg_length
5-
import org.apollo.game.plugins.api.component1
6-
import org.apollo.game.plugins.api.component2
7-
import org.apollo.game.plugins.api.component3
6+
import org.apollo.game.plugins.api.Position.component1
7+
import org.apollo.game.plugins.api.Position.component2
8+
import org.apollo.game.plugins.api.Position.component3
89

910
/**
1011
* Sends the player's position.

0 commit comments

Comments
 (0)