diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java index fa3ebe1f91fab36b68ebd20cabe67876c6057a9e..27ca5240b6cf3757500f15610501f5601409fd14 100644 --- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java +++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java @@ -1,11 +1,10 @@ package com.galaxytrucker.galaxytruckerreloaded.Model.Map; -import jdk.internal.util.xml.impl.Pair; import java.util.HashMap; public class Overworld { - private HashMap<Pair,Planet> planetMap; + private HashMap<float[],Planet> planetMap; public Overworld(int seed) { planetMap = new HashMap<>(); diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java index 8b11bac5374cbd54245927a24f84c250ebcfc64d..0d175fa280b8fddfea9d0a64e418a4eee343db15 100644 --- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java +++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java @@ -8,6 +8,8 @@ public abstract class Planet { private float posX; /** Vertikale Position auf der Karte */ private float posY; + + private float[] position; /** Ereignis dass auf diesem Planeten eintrifft */ private PlanetEvent event; } diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java index e72e0ff24bd0e5199d2fab268092e00d0dace94a..0a940a78c5259715d59463a838f47352eb992187 100644 --- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java +++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java @@ -1,6 +1,7 @@ package com.galaxytrucker.galaxytruckerreloaded.Model; -import jdk.internal.util.xml.impl.Pair; + +import com.galaxytrucker.galaxytruckerreloaded.Model.Map.Planet; public class Ship { @@ -39,7 +40,7 @@ public class Ship { /** * X and Y coordinates on the map */ - private Pair position; + private Planet position; /** * time needed until position can be changed again