Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Adjust advancing team logic in EventRelation to fix fromPlace handling

Browse Source
This commit is contained in:
Chaoscaot
2025-06-26 23:38:19 +02:00
parent 2f93f336c9
commit 1f1f99f8f3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CommonCore/SQL/src/de/steamwar/sql/EventRelation.java
+4 -2
View File
@@ -133,7 +133,7 @@ public class EventRelation {
public Optional<Team> getAdvancingTeam() { public Optional<Team> getAdvancingTeam() {
if (fromType == FromType.FIGHT) { if (fromType == FromType.FIGHT) {
if (fromPlace == 1) { if (fromPlace == 0) {
return getFromFight().flatMap(EventFight::getWinner); return getFromFight().flatMap(EventFight::getWinner);
} else { } else {
return getFromFight().flatMap(EventFight::getLosser); return getFromFight().flatMap(EventFight::getLosser);
@@ -141,7 +141,9 @@ public class EventRelation {
} else if (fromType == FromType.GROUP) { } else if (fromType == FromType.GROUP) {
return getFromGroup().map(EventGroup::calculatePoints) return getFromGroup().map(EventGroup::calculatePoints)
.flatMap(points -> points.entrySet().stream() .flatMap(points -> points.entrySet().stream()
.max(Map.Entry.comparingByValue()) .sorted(Map.Entry.comparingByValue())
.skip(fromPlace)
.findFirst()
.map(Map.Entry::getKey)); .map(Map.Entry::getKey));
} else { } else {
return Optional.empty(); return Optional.empty();