Move Position destructuring functions to their own object

This commit is contained in:
Major
2018-03-28 21:36:09 +01:00
parent 3c26d0acf1
commit 9c4eff712e
3 changed files with 15 additions and 11 deletions
@@ -2,8 +2,11 @@ package org.apollo.game.plugins.api
import org.apollo.game.model.Position import org.apollo.game.model.Position
// Support destructuring a Position into its components. /**
* Support destructuring a Position into its components.
operator fun Position.component1(): Int = x */
operator fun Position.component2(): Int = y object Position {
operator fun Position.component3(): Int = height operator fun Position.component1(): Int = x
operator fun Position.component2(): Int = y
operator fun Position.component3(): Int = height
}
+3 -3
View File
@@ -2,9 +2,9 @@ package org.apollo.game.plugins.area
import org.apollo.game.model.Position import org.apollo.game.model.Position
import org.apollo.game.model.entity.Player import org.apollo.game.model.entity.Player
import org.apollo.game.plugins.api.component1 import org.apollo.game.plugins.api.Position.component1
import org.apollo.game.plugins.api.component2 import org.apollo.game.plugins.api.Position.component2
import org.apollo.game.plugins.api.component3 import org.apollo.game.plugins.api.Position.component3
/** /**
* An area in the game world. * An area in the game world.
+4 -3
View File
@@ -1,10 +1,11 @@
import com.google.common.primitives.Ints import com.google.common.primitives.Ints
import org.apollo.game.model.Position import org.apollo.game.model.Position
import org.apollo.game.model.entity.setting.PrivilegeLevel import org.apollo.game.model.entity.setting.PrivilegeLevel
import org.apollo.game.plugin.util.command.valid_arg_length import org.apollo.game.plugin.util.command.valid_arg_length
import org.apollo.game.plugins.api.component1 import org.apollo.game.plugins.api.Position.component1
import org.apollo.game.plugins.api.component2 import org.apollo.game.plugins.api.Position.component2
import org.apollo.game.plugins.api.component3 import org.apollo.game.plugins.api.Position.component3
/** /**
* Sends the player's position. * Sends the player's position.