Yandrik/Gamelib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: swap EntityID constructor parameters

Browse Source
This commit is contained in:
punchready 2021-05-01 22:24:27 +02:00
parent b5614d3d37
commit 43cf4c6c1b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/uulm/teamname/marvelous/gamelibrary/entities/EntityID.java
View File

@ -10,10 +10,10 @@ public class EntityID {
/** /**
* Constructs a new {@link Entity}-{@link EntityID} based on the given index and {@link EntityType}. * Constructs a new {@link Entity}-{@link EntityID} based on the given index and {@link EntityType}.
* @param id The index of the entity
* @param type The type of the entity * @param type The type of the entity
* @param id The index of the entity
*/ */
public EntityID(int id, EntityType type) { public EntityID(EntityType type, int id) {
this.id = id; this.id = id;
this.type = type; this.type = type;
} }
@ -32,7 +32,7 @@ public class EntityID {
* @return The cloned {@link EntityID} * @return The cloned {@link EntityID}
*/ */
public EntityID clone() { public EntityID clone() {
return new EntityID(id, type); return new EntityID(type, id);
} }
/** /**

2
src/test/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateTest.java
View File

@ -17,7 +17,7 @@ class GameStateTest {
GameState state = new GameState(new IntVector2(10, 10)); GameState state = new GameState(new IntVector2(10, 10));
//set up game //set up game
state.entities.addEntity(new Rock(new EntityID(0, EntityType.Rocks), new IntVector2(0, 0), 100)); state.entities.addEntity(new Rock(new EntityID(EntityType.Rocks, 0), new IntVector2(0, 0), 100));
//snapshot state //snapshot state
GameState snapshot = state.snapshot(); GameState snapshot = state.snapshot();