diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/KillQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/KillQueries.java index 8efbc2c6e..4323219e7 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/KillQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/KillQueries.java @@ -178,7 +178,7 @@ public class KillQueries { AND + KillsTable.DATE + ">=?" + AND + KillsTable.DATE + "<=?" + GROUP_BY + KillsTable.VICTIM_UUID; - String sql = SELECT + "AVG(CAST(kills AS FLOAT)/CAST(deaths AS FLOAT)) as kdr" + + String sql = SELECT + "AVG(CAST(kills AS double)/CAST(deaths AS double)) as kdr" + FROM + '(' + selectKillCounts + ") q1" + INNER_JOIN + '(' + selectDeathCounts + ") q2 on q1." + KillsTable.KILLER_UUID + "=q2." + KillsTable.VICTIM_UUID + WHERE + "deaths!=0"; @@ -251,7 +251,7 @@ public class KillQueries { AND + KillsTable.DATE + "<=?" + GROUP_BY + KillsTable.WEAPON; String sql = SELECT + KillsTable.WEAPON + - FROM + '(' + innerSQL + ')' + + FROM + '(' + innerSQL + ") q1" + ORDER_BY + "kills DESC LIMIT ?"; return new QueryStatement>(sql, limit) { @@ -280,7 +280,7 @@ public class KillQueries { AND + KillsTable.DATE + "<=?" + GROUP_BY + KillsTable.WEAPON; String sql = SELECT + KillsTable.WEAPON + - FROM + '(' + innerSQL + ')' + + FROM + '(' + innerSQL + ") q1" + ORDER_BY + "kills DESC LIMIT ?"; return new QueryStatement>(sql, limit) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/WorldTimesQueries.java b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/WorldTimesQueries.java index f5643309e..56092ee21 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/WorldTimesQueries.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/WorldTimesQueries.java @@ -193,7 +193,7 @@ public class WorldTimesQueries { @Override public GMTimes processResults(ResultSet set) throws SQLException { - return extractGMTimes(set, GMTimes.getGMKeyArray()); + return set.next() ? extractGMTimes(set, GMTimes.getGMKeyArray()) : new GMTimes(); } }; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/json/PvPPvEJSONParser.java b/Plan/common/src/main/java/com/djrapitops/plan/system/json/PvPPvEJSONParser.java index 7171c99e6..984695e70 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/json/PvPPvEJSONParser.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/json/PvPPvEJSONParser.java @@ -113,7 +113,7 @@ public class PvPPvEJSONParser implements TabJSONParser> { Map insights = new HashMap<>(); - List top3Weapons = db.query(KillQueries.topWeaponsOfPlayer(monthAgo, now, serverUUID, 3)); + List top3Weapons = db.query(KillQueries.topWeaponsOfServer(monthAgo, now, serverUUID, 3)); insights.put("weapon_1st", getWeapon(top3Weapons, 0).orElse("-")); insights.put("weapon_2nd", getWeapon(top3Weapons, 1).orElse("-")); insights.put("weapon_3rd", getWeapon(top3Weapons, 2).orElse("-")); diff --git a/Plan/common/src/main/resources/assets/plan/bungeeconfig.yml b/Plan/common/src/main/resources/assets/plan/bungeeconfig.yml index aba62a657..fe82655af 100644 --- a/Plan/common/src/main/resources/assets/plan/bungeeconfig.yml +++ b/Plan/common/src/main/resources/assets/plan/bungeeconfig.yml @@ -117,6 +117,12 @@ Display_options: Show_player_IPs: true Graphs: Show_gaps_in_data: false + TPS: + High_threshold: 18 + Medium_threshold: 10 + Disk_space: + High_threshold: 500 + Medium_threshold: 100 Command_colors: Main: '&2' Secondary: '&7' diff --git a/Plan/common/src/main/resources/assets/plan/web/js/color-selector.js b/Plan/common/src/main/resources/assets/plan/web/js/color-selector.js index 919b2f43c..fc4380415 100644 --- a/Plan/common/src/main/resources/assets/plan/web/js/color-selector.js +++ b/Plan/common/src/main/resources/assets/plan/web/js/color-selector.js @@ -79,7 +79,7 @@ '.card,.bg-white,.modal-content,.page-loader,.nav-tabs .nav-link:hover,.nav-tabs,hr {background-color:#44475a;border-color:#6272a4!important;}' + '.bg-white.collapse-inner {border:1px solid;}' + '.card-header {background-color:#44475a;border-color:#6272a4;}' + - '#content,.col-black,.text-gray-800,.collapse-item,.modal-title,.modal-body,.page-loader,.close,.fc-title,.fc-time {color:#eee8d5 !important;}' + + '#content,.col-black,.text-gray-800,.collapse-item,.modal-title,.modal-body,.page-loader,.close,.fc-title,.fc-time,pre {color:#eee8d5 !important;}' + '.collapse-item:hover,.nav-link.active {background-color: #606270 !important;}' + '.nav-tabs .nav-link.active {background-color: #44475a !important;border-color:#6272a4 #6272a4 #44475a !important;}' + '.fc-today {background:#646e8c !important}' + diff --git a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java index c66cdb6e1..61a6e88a1 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java @@ -114,11 +114,6 @@ public class ConfigSettingKeyTest { settings.remove(PluginSettings.SERVER_NAME); settings.remove(PluginSettings.BUNGEE_COPY_CONFIG); settings.remove(DatabaseSettings.TYPE); - settings.remove(DisplaySettings.GRAPH_TPS_THRESHOLD_MED); - settings.remove(DisplaySettings.GRAPH_TPS_THRESHOLD_HIGH); - settings.remove(DisplaySettings.GRAPH_DISK_THRESHOLD_MED); - settings.remove(DisplaySettings.GRAPH_DISK_THRESHOLD_HIGH); - settings.remove(DisplaySettings.GRAPH_DISK_THRESHOLD_HIGH); settings.remove(DisplaySettings.WORLD_ALIASES); settings.remove(TimeSettings.ANALYSIS_REFRESH_PERIOD); return settings;