limepotato/potrogue
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump amethyst and fix player duplication bug

Browse source
This commit is contained in:
nelle 2023-11-01 03:21:45 -06:00
parent 464692aea7
commit 4faa70d352
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -3,7 +3,7 @@ org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2048M org.gradle.jvmargs=-Xmx2048M
org.gradle.daemon=true org.gradle.daemon=true
amethyst_version=2020.1.1-RELEASE amethyst_version=2021.0.3-RELEASE
zircon_version=2021.1.0-RELEASE zircon_version=2021.1.0-RELEASE
junit_version=4.12 junit_version=4.12
mockito_version=1.10.19 mockito_version=1.10.19

4
src/main/kotlin/group/ouroboros/potrogue/world/World.kt
View file

@ -3,10 +3,10 @@ package group.ouroboros.potrogue.world
import group.ouroboros.potrogue.blocks.GameBlock import group.ouroboros.potrogue.blocks.GameBlock
import group.ouroboros.potrogue.extensions.GameEntity import group.ouroboros.potrogue.extensions.GameEntity
import group.ouroboros.potrogue.extensions.position import group.ouroboros.potrogue.extensions.position
import org.hexworks.amethyst.api.Engine
import org.hexworks.amethyst.api.entity.Entity import org.hexworks.amethyst.api.entity.Entity
import org.hexworks.amethyst.api.entity.EntityType import org.hexworks.amethyst.api.entity.EntityType
import org.hexworks.amethyst.internal.TurnBasedEngine import org.hexworks.amethyst.internal.TurnBasedEngine
import org.hexworks.amethyst.platform.Dispatchers
import org.hexworks.cobalt.datatypes.Maybe import org.hexworks.cobalt.datatypes.Maybe
import org.hexworks.zircon.api.builder.game.GameAreaBuilder import org.hexworks.zircon.api.builder.game.GameAreaBuilder
import org.hexworks.zircon.api.data.Position3D import org.hexworks.zircon.api.data.Position3D
@ -32,7 +32,7 @@ class World (
// We added the Engine to the world which handles our entities. // We added the Engine to the world which handles our entities.
// We could have used dependency inversion here, but this is not likely to change in the future so we’re keeping it simple. // We could have used dependency inversion here, but this is not likely to change in the future so we’re keeping it simple.
private val engine: TurnBasedEngine<GameContext> = Engine.create() private val engine: TurnBasedEngine<GameContext> = TurnBasedEngine(Dispatchers.Single)
init { init {
startingBlocks.forEach { (pos, block) -> startingBlocks.forEach { (pos, block) ->