diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/ActivityIndexQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/ActivityIndexQueries.java index c4b63dde3..84b6f14a7 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/ActivityIndexQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/ActivityIndexQueries.java @@ -380,7 +380,7 @@ public class ActivityIndexQueries { statement.setString(3, serverUUID.toString()); // Have played in the last half of the time frame - long half = before - (after - before) / 2; + long half = before + (before - after) / 2; statement.setLong(4, half); statement.setLong(5, before); statement.setString(6, serverUUID.toString()); @@ -421,7 +421,7 @@ public class ActivityIndexQueries { statement.setString(3, serverUUID.toString()); // Have played in the last half of the time frame - long half = before - (after - before) / 2; + long half = before + (before - after) / 2; statement.setLong(4, half); statement.setLong(5, before); statement.setString(6, serverUUID.toString()); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/NetworkActivityIndexQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/NetworkActivityIndexQueries.java index dd7d58417..f8497a1ea 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/NetworkActivityIndexQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/NetworkActivityIndexQueries.java @@ -363,7 +363,7 @@ public class NetworkActivityIndexQueries { statement.setLong(2, after); // Have played in the last half of the time frame - long half = before - (after - before) / 2; + long half = before + (before - after) / 2; statement.setLong(3, half); statement.setLong(4, before); setSelectActivityIndexSQLParameters(statement, 5, threshold, before); @@ -400,7 +400,7 @@ public class NetworkActivityIndexQueries { statement.setLong(2, after); // Have played in the last half of the time frame - long half = before - (after - before) / 2; + long half = before + (before - after) / 2; statement.setLong(3, half); statement.setLong(4, before); setSelectActivityIndexSQLParameters(statement, 5, threshold, before); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/PlayerCountQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/PlayerCountQueries.java index 9b122fa0d..077dd960f 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/PlayerCountQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/analysis/PlayerCountQueries.java @@ -342,11 +342,11 @@ public class PlayerCountQueries { public static Query retainedPlayerCount(long after, long before, UUID serverUUID) { String selectNewUUIDs = SELECT + UserInfoTable.USER_UUID + FROM + UserInfoTable.TABLE_NAME + - WHERE + UserInfoTable.REGISTERED + "<=?" + - AND + UserInfoTable.REGISTERED + ">=?" + + WHERE + UserInfoTable.REGISTERED + ">=?" + + AND + UserInfoTable.REGISTERED + "<=?" + AND + UserInfoTable.SERVER_UUID + "=?"; - String selectUniqueUUIDs = SELECT + "DISTINCT " + SessionsTable.USER_UUID + + String selectUniqueUUIDs = SELECT + DISTINCT + SessionsTable.USER_UUID + FROM + SessionsTable.TABLE_NAME + WHERE + SessionsTable.SESSION_START + ">=?" + AND + SessionsTable.SESSION_END + "<=?" + @@ -354,17 +354,17 @@ public class PlayerCountQueries { String sql = SELECT + "COUNT(1) as player_count" + FROM + '(' + selectNewUUIDs + ") q1" + - INNER_JOIN + '(' + selectUniqueUUIDs + ") q2 on q1." + SessionsTable.USER_UUID + "=q2." + SessionsTable.USER_UUID; + INNER_JOIN + '(' + selectUniqueUUIDs + ") q2 on q1." + UserInfoTable.USER_UUID + "=q2." + SessionsTable.USER_UUID; return new QueryStatement(sql) { @Override public void prepare(PreparedStatement statement) throws SQLException { - statement.setLong(1, before); - statement.setLong(2, after); + statement.setLong(1, after); + statement.setLong(2, before); statement.setString(3, serverUUID.toString()); // Have played in the last half of the time frame - long half = before - (after - before) / 2; + long half = before + (before - after) / 2; statement.setLong(4, half); statement.setLong(5, before); statement.setString(6, serverUUID.toString());