Removed server-specific entities.

src/main/java/eu/tankernn/game/server/World.java

@@ -3,17 +3,17 @@ package eu.tankernn.game.server;
 import java.util.ArrayList;
 import java.util.List;
 
-import eu.tankernn.game.server.entities.ServerEntity;
 import eu.tankernn.game.server.entities.player.ServerPlayer;
+import eu.tankernn.gameEngine.entities.Entity;
 import eu.tankernn.gameEngine.entities.Light;
 
 public class World {
 	int seed;
 	List<Light> lights;
-	List<ServerEntity> entities;
+	List<Entity> entities;
 	List<ServerPlayer> players;
 	
-	public World(List<Light> lights, List<ServerEntity> entities) {
+	public World(List<Light> lights, List<Entity> entities) {
 		this.lights = lights;
 		this.entities = entities;
 		this.players = new ArrayList<ServerPlayer>();

src/main/java/eu/tankernn/game/server/entities/ServerEntity.java

@@ -1,5 +0,0 @@
-package eu.tankernn.game.server.entities;
-
-public class ServerEntity {
-
-}

src/main/java/eu/tankernn/game/server/entities/player/ServerPlayer.java

@@ -1,7 +1,13 @@
 package eu.tankernn.game.server.entities.player;
 
-import eu.tankernn.game.server.entities.ServerEntity;
+import eu.tankernn.gameEngine.entities.Player;
 
-public class ServerPlayer extends ServerEntity {
+public class ServerPlayer {
+	private Player playerEntity;
 	private String username;
+	
+	public ServerPlayer(String username, Player entity) {
+		this.username = username;
+		this.playerEntity = entity;
+	}
 }