Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -24,6 +24,8 @@ import netwerkprog.game.client.game.map.GameTile;
|
||||
import netwerkprog.game.client.game.map.Map;
|
||||
import netwerkprog.game.client.game.map.MapRenderer;
|
||||
import netwerkprog.game.util.data.Data;
|
||||
import netwerkprog.game.util.data.character.DamageData;
|
||||
import netwerkprog.game.util.data.character.MoveData;
|
||||
import netwerkprog.game.util.data.connection.NameData;
|
||||
import netwerkprog.game.util.data.connection.ReadyData;
|
||||
import netwerkprog.game.util.data.connection.TeamData;
|
||||
@@ -400,6 +402,16 @@ public class MainGame extends Game implements ClientCallback {
|
||||
this.enemyReady = true;
|
||||
System.out.println("enemy is ready");
|
||||
}
|
||||
} else if (data instanceof MoveData) {
|
||||
MoveData moveData = (MoveData) data;
|
||||
if (moveData.getUsername().equals(this.username)) {
|
||||
moveData.getTile().visit(team.get(moveData.getCharacterName()));
|
||||
} else {
|
||||
moveData.getTile().visit(enemyTeam.get(moveData.getCharacterName()));
|
||||
}
|
||||
} else if (data instanceof DamageData) {
|
||||
DamageData damageData = (DamageData) data;
|
||||
team.get(damageData.getName()).damage(10);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user