This commit is contained in:
@@ -196,7 +196,12 @@ public class TournamentPlayService {
|
|||||||
var event = getEventByType(tournament, eventType);
|
var event = getEventByType(tournament, eventType);
|
||||||
playerSubstitution.setEvent(event);
|
playerSubstitution.setEvent(event);
|
||||||
|
|
||||||
var substitute = getTournamentPlayerById(tournament, substitution.getSubstitute());
|
TournamentPlayer substitute;
|
||||||
|
if (substitution.getSubstitute() != null) {
|
||||||
|
substitute = getTournamentPlayerById(tournament, substitution.getSubstitute());
|
||||||
|
} else {
|
||||||
|
substitute = null;
|
||||||
|
}
|
||||||
playerSubstitution.setSubstitute(substitute);
|
playerSubstitution.setSubstitute(substitute);
|
||||||
playerSubstitutions.add(playerSubstitution);
|
playerSubstitutions.add(playerSubstitution);
|
||||||
}
|
}
|
||||||
@@ -307,7 +312,6 @@ public class TournamentPlayService {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private TournamentPlayer getTournamentPlayer(Tournament tournament, Long playerId) {
|
private TournamentPlayer getTournamentPlayer(Tournament tournament, Long playerId) {
|
||||||
for (var tournamentPlayer : tournament.getTournamentPlayers()) {
|
for (var tournamentPlayer : tournament.getTournamentPlayers()) {
|
||||||
if (playerId.equals(tournamentPlayer.getPlayer().getId())) {
|
if (playerId.equals(tournamentPlayer.getPlayer().getId())) {
|
||||||
|
|||||||
Reference in New Issue
Block a user