From 41f3d44a9053ae0ffe4c2dfc6240143f6e6cc6bb Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Sun, 21 Feb 2021 04:49:21 +0100 Subject: [PATCH] missed refactors --- .../listeners/player/PlayerHitByExplosionListener.java | 2 +- src/main/java/eu/endermite/togglepvp/util/CombatTimer.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerHitByExplosionListener.java b/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerHitByExplosionListener.java index 1f1edea..81adfec 100644 --- a/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerHitByExplosionListener.java +++ b/src/main/java/eu/endermite/togglepvp/listeners/player/PlayerHitByExplosionListener.java @@ -31,7 +31,7 @@ public class PlayerHitByExplosionListener implements Listener { UUID damageruuid = UUID.fromString(event.getDamager().getMetadata("PLAYEREXPLODED").get(0).asString()); if (!victim.getUniqueId().equals(damageruuid)) { ConfigCache config = TogglePvp.getPlugin().getConfigCache(); - boolean damagerPvpEnabled = SmartCache.getPlayerData(damageruuid).isPvpEnabled(); + boolean damagerPvpEnabled = TogglePvp.getPlugin().getSmartCache().getPlayerData(damageruuid).isPvpEnabled(); if (!damagerPvpEnabled) { PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_attacker()); event.setCancelled(true); diff --git a/src/main/java/eu/endermite/togglepvp/util/CombatTimer.java b/src/main/java/eu/endermite/togglepvp/util/CombatTimer.java index b2c2835..dfb2d25 100644 --- a/src/main/java/eu/endermite/togglepvp/util/CombatTimer.java +++ b/src/main/java/eu/endermite/togglepvp/util/CombatTimer.java @@ -10,7 +10,7 @@ public class CombatTimer { public static void refreshPlayersCombatTime(UUID uuid) { try { long now = Instant.now().getEpochSecond(); - long combattime = SmartCache.getPlayerData(uuid).getCombattime(); + long combattime = TogglePvp.getPlugin().getSmartCache().getPlayerData(uuid).getCombattime(); if (combattime < now) { PluginMessages.sendActionBar(uuid, TogglePvp.getPlugin().getConfigCache().getEntering_combat()); } @@ -25,7 +25,7 @@ public class CombatTimer { public static boolean isInCombat(UUID uuid) { try { - long combattimer = SmartCache.getPlayerData(uuid).getCombattime(); + long combattimer = TogglePvp.getPlugin().getSmartCache().getPlayerData(uuid).getCombattime(); long now = Instant.now().getEpochSecond(); return combattimer > now; } catch (Exception e) {