YouHaveTrouble/PreventStabby
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/PreventStabby.git synced 2026-05-12 05:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

missed refactors

Browse Source
This commit is contained in:
YouHaveTrouble
2021-02-21 04:49:21 +01:00
parent c0edc64fd8
commit 41f3d44a90
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/eu/endermite/togglepvp/listeners/player/PlayerHitByExplosionListener.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class PlayerHitByExplosionListener implements Listener {
UUID damageruuid = UUID.fromString(event.getDamager().getMetadata("PLAYEREXPLODED").get(0).asString()); UUID damageruuid = UUID.fromString(event.getDamager().getMetadata("PLAYEREXPLODED").get(0).asString());
if (!victim.getUniqueId().equals(damageruuid)) { if (!victim.getUniqueId().equals(damageruuid)) {
ConfigCache config = TogglePvp.getPlugin().getConfigCache(); ConfigCache config = TogglePvp.getPlugin().getConfigCache();
boolean damagerPvpEnabled = SmartCache.getPlayerData(damageruuid).isPvpEnabled(); boolean damagerPvpEnabled = TogglePvp.getPlugin().getSmartCache().getPlayerData(damageruuid).isPvpEnabled();
if (!damagerPvpEnabled) { if (!damagerPvpEnabled) {
PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_attacker()); PluginMessages.sendActionBar(damageruuid, config.getCannot_attack_attacker());
event.setCancelled(true); event.setCancelled(true);
src/main/java/eu/endermite/togglepvp/util/CombatTimer.java
+2 -2
View File
@@ -10,7 +10,7 @@ public class CombatTimer {
public static void refreshPlayersCombatTime(UUID uuid) { public static void refreshPlayersCombatTime(UUID uuid) {
try { try {
long now = Instant.now().getEpochSecond(); long now = Instant.now().getEpochSecond();
long combattime = SmartCache.getPlayerData(uuid).getCombattime(); long combattime = TogglePvp.getPlugin().getSmartCache().getPlayerData(uuid).getCombattime();
if (combattime < now) { if (combattime < now) {
PluginMessages.sendActionBar(uuid, TogglePvp.getPlugin().getConfigCache().getEntering_combat()); PluginMessages.sendActionBar(uuid, TogglePvp.getPlugin().getConfigCache().getEntering_combat());
} }
@@ -25,7 +25,7 @@ public class CombatTimer {
public static boolean isInCombat(UUID uuid) { public static boolean isInCombat(UUID uuid) {
try { try {
long combattimer = SmartCache.getPlayerData(uuid).getCombattime(); long combattimer = TogglePvp.getPlugin().getSmartCache().getPlayerData(uuid).getCombattime();
long now = Instant.now().getEpochSecond(); long now = Instant.now().getEpochSecond();
return combattimer > now; return combattimer > now;
} catch (Exception e) { } catch (Exception e) {