2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-06 00:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix kotlin code style issues

Browse Source
This commit is contained in:
Gary Tierney
2018-09-04 04:43:34 +01:00
parent b6086d57b8
commit 475c7ac741
89 changed files with 338 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/plugin/dummy/src/dummy.plugin.kts
-6
View File
@@ -1,9 +1,6 @@
import kotlinx.coroutines.experimental.*
import kotlinx.coroutines.experimental.channels.Channel
import kotlinx.coroutines.experimental.selects.select
import org.apollo.game.action.ActionBlock
import org.apollo.game.action.AsyncDistancedAction
import org.apollo.game.action.DistancedAction
import org.apollo.game.message.impl.ObjectActionMessage
import org.apollo.game.model.Animation
import org.apollo.game.model.Position
@@ -50,10 +47,8 @@ class DummyAction(val player: Player, position: Position) : AsyncDistancedAction
player.startAction(DummyAction(player, position))
message.terminate()
}
}
override fun action(): ActionBlock = {
mob.sendMessage("You hit the dummy.")
mob.turnTo(position)
@@ -68,5 +63,4 @@ class DummyAction(val player: Player, position: Position) : AsyncDistancedAction
skills.addExperience(Skill.ATTACK, EXP_PER_HIT)
}
}
}
game/plugin/dummy/test/TrainingDummyTest.kt
+1 -2
View File
@@ -5,12 +5,12 @@ import org.apollo.game.model.World
import org.apollo.game.model.entity.Player
import org.apollo.game.model.entity.Skill
import org.apollo.game.plugin.testing.assertions.after
import org.apollo.game.plugin.testing.assertions.contains
import org.apollo.game.plugin.testing.junit.ApolloTestingExtension
import org.apollo.game.plugin.testing.junit.api.ActionCapture
import org.apollo.game.plugin.testing.junit.api.annotations.TestMock
import org.apollo.game.plugin.testing.junit.api.interactions.interactWith
import org.apollo.game.plugin.testing.junit.api.interactions.spawnObject
import org.apollo.game.plugin.testing.assertions.contains
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
@@ -60,5 +60,4 @@ class TrainingDummyTest {
assertEquals(beforeExp, skills.getExperience(Skill.ATTACK))
}
}
}