diff --git a/RaceTimer/racetimer_endpoints/src/main/java/facade/Facade.java b/RaceTimer/racetimer_endpoints/src/main/java/facade/Facade.java index 83eed583..c9f9d852 100644 --- a/RaceTimer/racetimer_endpoints/src/main/java/facade/Facade.java +++ b/RaceTimer/racetimer_endpoints/src/main/java/facade/Facade.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; @@ -296,9 +297,6 @@ public class Facade { } else if (bannerID == 13) { bannerName = "Trial Admin"; bannerURL = "https://unloze.com/images/badges/Junior-Admin_Badge.png"; - } else if (bannerID == 15) { - bannerName = "Event Winner"; - bannerURL = "https://unloze.com/images/badges/Event-Winner.png"; } else if (bannerID == 19) { bannerName = "Discord Manager"; bannerURL = "https://unloze.com/images/badges/Discord-Manager.png"; @@ -399,10 +397,23 @@ public class Facade { Collection mapboards = mapBoardCache.values(); for (MapBoard mapboard : mapboards) { //System.out.println("mapName: " + mapboard.getMapName()); - List mapvalues = new ArrayList(mapboard.getMapvalues()); - + List mapvalues = new ArrayList(); + List less_than_a_minute = new ArrayList<>(); + for (MapValues mv : mapboard.getMapvalues()) + { + String time = mv.getTime(); + if (!time.contains(":")) + { + less_than_a_minute.add(mv); + } + else{ + mapvalues.add(mv); + } + } mapvalues.sort(Comparator.comparing(MapValues::getTime)); - mapBoardCache.get(mapboard.getMapName()).setMapvalues(mapvalues); + less_than_a_minute.sort(Comparator.comparing(MapValues::getTime)); + less_than_a_minute.addAll(mapvalues); + mapBoardCache.get(mapboard.getMapName()).setMapvalues(less_than_a_minute); } } diff --git a/RaceTimer/racetimer_react/src/Maps/Maps.js b/RaceTimer/racetimer_react/src/Maps/Maps.js index a63d434e..8eec20e1 100644 --- a/RaceTimer/racetimer_react/src/Maps/Maps.js +++ b/RaceTimer/racetimer_react/src/Maps/Maps.js @@ -120,7 +120,7 @@ class Maps extends React.Component { Position: {e.position}
Mappoints: {e.mapPoint}
- Time: 0{e.mapTime}
+ Time: {e.mapTime}
{Object.keys(e.badgesUrls).map(badges => (

diff --git a/RaceTimer/racetimer_react/src/Player/Player.js b/RaceTimer/racetimer_react/src/Player/Player.js index f14c6bde..2bf42d23 100644 --- a/RaceTimer/racetimer_react/src/Player/Player.js +++ b/RaceTimer/racetimer_react/src/Player/Player.js @@ -128,7 +128,7 @@ class Player extends React.Component { Map: {e.mapname}
Stage: {e.mapstage}
Position: {e.position}
- Time: 0{e.mapTime}
+ Time: {e.mapTime}
MapPoints: {e.mapPoint}