From ef781723b35723a1016279ab93a3da0368c56d1d Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Fri, 25 May 2018 10:05:54 +0300 Subject: [PATCH] Removed use of MiscUtils#getTime in PluginBridge --- .../pluginbridge/plan/aac/PlayerHackKickListener.java | 3 +-- .../plan/advancedachievements/AdvancedAchievementsData.java | 5 ++--- .../pluginbridge/plan/buycraft/MoneyStackGraph.java | 3 +-- .../pluginbridge/plan/placeholderapi/PlanPlaceholders.java | 5 ++--- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java index 199c3981a..57cf95f85 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java @@ -8,7 +8,6 @@ package com.djrapitops.pluginbridge.plan.aac; import com.djrapitops.plan.system.database.databases.Database; import com.djrapitops.plan.system.database.databases.sql.SQLDB; import com.djrapitops.plan.system.processing.Processing; -import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; import me.konsolas.aac.api.AACAPIProvider; import me.konsolas.aac.api.HackType; @@ -38,7 +37,7 @@ public class PlayerHackKickListener implements Listener { Player player = event.getPlayer(); UUID uuid = player.getUniqueId(); HackType hackType = event.getHackType(); - long time = MiscUtils.getTime(); + long time = System.currentTimeMillis(); int violations = AACAPIProvider.getAPI().getViolationLevel(player, hackType); HackObject hackObject = new HackObject(uuid, time, hackType, violations); diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java index dc44dd057..6e49079b8 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/advancedachievements/AdvancedAchievementsData.java @@ -9,7 +9,6 @@ import com.djrapitops.plan.data.element.InspectContainer; import com.djrapitops.plan.data.plugin.ContainerSize; import com.djrapitops.plan.data.plugin.PluginData; import com.djrapitops.plan.utilities.FormatUtils; -import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plan.utilities.analysis.MathUtils; import com.djrapitops.plugin.api.TimeAmount; import com.hm.achievement.api.AdvancedAchievementsAPI; @@ -47,7 +46,7 @@ public class AdvancedAchievementsData extends PluginData { @Override public AnalysisContainer getServerData(Collection collection, AnalysisContainer analysisContainer) { - if (MiscUtils.getTime() - lastRefresh > TimeAmount.MINUTE.ms() * 5L) { + if (System.currentTimeMillis() - lastRefresh > TimeAmount.MINUTE.ms() * 5L) { refreshTotalAchievements(); } long total = getTotal(totalAchievements); @@ -65,6 +64,6 @@ public class AdvancedAchievementsData extends PluginData { private void refreshTotalAchievements() { totalAchievements = aaAPI.getPlayersTotalAchievements(); - lastRefresh = MiscUtils.getTime(); + lastRefresh = System.currentTimeMillis(); } } \ No newline at end of file diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/buycraft/MoneyStackGraph.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/buycraft/MoneyStackGraph.java index f36c67c3b..93ad054f3 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/buycraft/MoneyStackGraph.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/buycraft/MoneyStackGraph.java @@ -6,7 +6,6 @@ package com.djrapitops.pluginbridge.plan.buycraft; import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.system.settings.theme.ThemeVal; -import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plan.utilities.html.graphs.stack.AbstractStackGraph; import com.djrapitops.plan.utilities.html.graphs.stack.StackDataSet; import com.djrapitops.plugin.api.TimeAmount; @@ -32,7 +31,7 @@ public class MoneyStackGraph { } public static MoneyStackGraph create(List payments) { - long now = MiscUtils.getTime(); + long now = System.currentTimeMillis(); long oldestDate = payments.isEmpty() ? now : payments.get(payments.size() - 1).getDate(); String[] labels = getLabels(now, oldestDate); diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/placeholderapi/PlanPlaceholders.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/placeholderapi/PlanPlaceholders.java index 3f0f576fd..11f4891bf 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/placeholderapi/PlanPlaceholders.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/placeholderapi/PlanPlaceholders.java @@ -8,7 +8,6 @@ import com.djrapitops.plan.data.container.TPS; import com.djrapitops.plan.system.PlanSystem; import com.djrapitops.plan.system.database.databases.Database; import com.djrapitops.plan.utilities.FormatUtils; -import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plan.utilities.analysis.Analysis; import com.djrapitops.plan.utilities.analysis.MathUtils; import com.djrapitops.plugin.api.TimeAmount; @@ -94,7 +93,7 @@ public class PlanPlaceholders extends PlaceholderExpansion { private Serializable getServerValue(String identifier) { Callable serverProfile = Analysis::getServerProfile; - long now = MiscUtils.getTime(); + long now = System.currentTimeMillis(); long dayAgo = now - TimeAmount.DAY.ms(); long weekAgo = now - TimeAmount.WEEK.ms(); long monthAgo = now - TimeAmount.MONTH.ms(); @@ -148,7 +147,7 @@ public class PlanPlaceholders extends PlaceholderExpansion { UUID uuid = player.getUniqueId(); Callable profile = () -> Database.getActive().fetch().getPlayerProfile(uuid); - long now = MiscUtils.getTime(); + long now = System.currentTimeMillis(); long dayAgo = now - TimeAmount.DAY.ms(); long weekAgo = now - TimeAmount.WEEK.ms(); long monthAgo = now - TimeAmount.MONTH.ms();