Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-08 17:37:34 +01:00
Code Issues Projects Releases Wiki Activity

Added ACTIVE_SESSION to Player placeholders

Browse Source 
Playtime was not being updated live for the player placeholders because
the Active session was not added in the PlayerContainer before
calculations.

- Added the active session (if present) to the placeholders
- Updated session state when it is fetched from the cache (world time)

Affects issues:
- Close #1209
This commit is contained in:
Rsl1122 2019-11-07 12:55:57 +02:00
parent 97094a9e03
commit f641c44bf2
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/placeholders/PlayerPlaceHolder.java
View File

@ -23,6 +23,7 @@ import com.djrapitops.plan.delivery.domain.mutators.PlayerVersusMutator;
import com.djrapitops.plan.delivery.domain.mutators.SessionsMutator; import com.djrapitops.plan.delivery.domain.mutators.SessionsMutator;
import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.delivery.formatting.Formatter;
import com.djrapitops.plan.delivery.formatting.Formatters; import com.djrapitops.plan.delivery.formatting.Formatters;
import com.djrapitops.plan.gathering.cache.SessionCache;
import com.djrapitops.plan.identification.ServerInfo; import com.djrapitops.plan.identification.ServerInfo;
import com.djrapitops.plan.storage.database.DBSystem; import com.djrapitops.plan.storage.database.DBSystem;
import com.djrapitops.plan.storage.database.queries.containers.ContainerFetchQueries; import com.djrapitops.plan.storage.database.queries.containers.ContainerFetchQueries;
@ -161,6 +162,8 @@ public class PlayerPlaceHolder extends AbstractPlanPlaceHolder {
// Checkstyle.ON: CyclomaticComplexity // Checkstyle.ON: CyclomaticComplexity
private PlayerContainer getPlayer(UUID playerUUID) { private PlayerContainer getPlayer(UUID playerUUID) {
return dbSystem.getDatabase().query(ContainerFetchQueries.fetchPlayerContainer(playerUUID)); PlayerContainer player = dbSystem.getDatabase().query(ContainerFetchQueries.fetchPlayerContainer(playerUUID));
SessionCache.getCachedSession(playerUUID).ifPresent(session -> player.putRawData(PlayerKeys.ACTIVE_SESSION, session));
return player;
} }
} }

8
Plan/common/src/main/java/com/djrapitops/plan/gathering/cache/SessionCache.java vendored
View File

@ -49,9 +49,7 @@ public class SessionCache {
} }
public static void refreshActiveSessionsState() { public static void refreshActiveSessionsState() {
for (Session session : ACTIVE_SESSIONS.values()) { ACTIVE_SESSIONS.values().forEach(Session::updateState);
session.getValue(SessionKeys.WORLD_TIMES).ifPresent(worldTimes -> worldTimes.updateState(System.currentTimeMillis()));
}
} }
/** /**
@ -61,7 +59,9 @@ public class SessionCache {
* @return Optional with the session inside it if found. * @return Optional with the session inside it if found.
*/ */
public static Optional<Session> getCachedSession(UUID playerUUID) { public static Optional<Session> getCachedSession(UUID playerUUID) {
return Optional.ofNullable(ACTIVE_SESSIONS.get(playerUUID)); Optional<Session> found = Optional.ofNullable(ACTIVE_SESSIONS.get(playerUUID));
found.ifPresent(Session::updateState);
return found;
} }
/** /**

4
Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/Session.java
View File

@ -254,4 +254,8 @@ public class Session extends DynamicDataContainer implements DateHolder {
", afkTime=" + afkTime + ", afkTime=" + afkTime +
'}'; '}';
} }
public void updateState() {
worldTimes.updateState(System.currentTimeMillis());
}
} }