Skip to content

Commit 30e7673

Browse files
committed
fix(placeholder): fix displaying playtime placeholder
1 parent 0f6cd76 commit 30e7673

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed
Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
11
package com.github.imdmk.playtime.core.feature.playtime.placeholder;
22

3-
import com.github.imdmk.playtime.core.feature.playtime.PlayTimeUser;
4-
import com.github.imdmk.playtime.core.feature.playtime.PlayTimeUserService;
3+
import com.github.imdmk.playtime.api.PlayTime;
54
import com.github.imdmk.playtime.core.injector.annotations.placeholder.Placeholder;
65
import com.github.imdmk.playtime.core.platform.placeholder.PluginPlaceholder;
6+
import com.github.imdmk.playtime.core.platform.playtime.PlayTimeAdapter;
77
import com.github.imdmk.playtime.core.time.DurationService;
88
import org.bukkit.entity.Player;
99
import org.panda_lang.utilities.inject.annotations.Inject;
1010

11-
import java.util.UUID;
12-
1311
@Placeholder
1412
final class PlayTimePlaceholder implements PluginPlaceholder {
1513

1614
private static final String IDENTIFIER = "playtime";
1715

1816
private final DurationService durationService;
19-
private final PlayTimeUserService userService;
17+
private final PlayTimeAdapter playTimeAdapter;
2018

2119
@Inject
2220
PlayTimePlaceholder(
2321
DurationService durationService,
24-
PlayTimeUserService userService
22+
PlayTimeAdapter playTimeAdapter
2523
) {
2624
this.durationService = durationService;
27-
this.userService = userService;
25+
this.playTimeAdapter = playTimeAdapter;
2826
}
2927

3028
@Override
@@ -34,11 +32,7 @@ public String identifier() {
3432

3533
@Override
3634
public String request(Player player, String params) {
37-
UUID playerId = player.getUniqueId();
38-
39-
return userService.getUser(playerId)
40-
.map(PlayTimeUser::getPlayTime)
41-
.map(time -> durationService.format(time.toDuration()))
42-
.orElse(null);
35+
PlayTime playTime = playTimeAdapter.read(player);
36+
return durationService.format(playTime.toDuration());
4337
}
4438
}

0 commit comments

Comments
 (0)