From 9b68687ef755ed151869789668844c09cfd0db57 Mon Sep 17 00:00:00 2001 From: Driftay Date: Wed, 11 Sep 2019 06:58:46 -0400 Subject: [PATCH] Code Reformat --- .../com/massivecraft/factions/Faction.java | 1 - src/main/java/com/massivecraft/factions/P.java | 2 +- .../massivecraft/factions/cmd/FCmdRoot.java | 2 +- .../factions/cmd/check/CheckSettingsFrame.java | 2 +- .../factions/cmd/check/CheckTask.java | 18 +++++++++--------- .../factions/cmd/check/WeeWooTask.java | 2 +- .../factions/event/FPlayerRoleChangeEvent.java | 3 ++- .../listeners/FactionsPlayerListener.java | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/Faction.java b/src/main/java/com/massivecraft/factions/Faction.java index 2ff23e17..497550b1 100644 --- a/src/main/java/com/massivecraft/factions/Faction.java +++ b/src/main/java/com/massivecraft/factions/Faction.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; public interface Faction extends EconomyParticipator { - int getWallCheckMinutes(); void setWallCheckMinutes(int minutes); diff --git a/src/main/java/com/massivecraft/factions/P.java b/src/main/java/com/massivecraft/factions/P.java index 5ad487f3..9289ce54 100644 --- a/src/main/java/com/massivecraft/factions/P.java +++ b/src/main/java/com/massivecraft/factions/P.java @@ -239,7 +239,7 @@ public class P extends MPlugin { } log("Skript addon registered!"); } - if(Conf.useCheckSystem) { + if (Conf.useCheckSystem) { int minute = 1200; this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 3), 0L, (long) (minute * 3)); this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 5), 0L, (long) (minute * 5)); diff --git a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java index 87370862..f1effd00 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java +++ b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java @@ -302,7 +302,7 @@ public class FCmdRoot extends FCommand { if (P.p.getConfig().getBoolean("enable-faction-flight", false)) { this.addSubCommand(this.cmdFly); } - if (Bukkit.getServer().getPluginManager().getPlugin("FactionsTop") != null || Bukkit.getServer().getPluginManager().getPlugin("SavageFTOP") != null || Bukkit.getServer().getPluginManager().getPlugin("SaberFTOP") != null) { + if (Bukkit.getServer().getPluginManager().getPlugin("FactionsTop") != null || Bukkit.getServer().getPluginManager().getPlugin("SavageFTOP") != null || Bukkit.getServer().getPluginManager().getPlugin("SaberFTOP") != null) { P.p.log(Level.INFO, "Found FactionsTop plugin. Disabling our own /f top command."); } else { P.p.log(Level.INFO, "Enabling FactionsTop command, this is a very basic /f top please get a dedicated /f top resource if you want land calculation etc."); diff --git a/src/main/java/com/massivecraft/factions/cmd/check/CheckSettingsFrame.java b/src/main/java/com/massivecraft/factions/cmd/check/CheckSettingsFrame.java index 3dd0f813..2e198fff 100644 --- a/src/main/java/com/massivecraft/factions/cmd/check/CheckSettingsFrame.java +++ b/src/main/java/com/massivecraft/factions/cmd/check/CheckSettingsFrame.java @@ -103,7 +103,7 @@ public class CheckSettingsFrame implements InventoryHolder, FactionGUI { return minutes + " Minutes"; } - public String color(String message){ + public String color(String message) { return ChatColor.translateAlternateColorCodes('&', message); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/check/CheckTask.java b/src/main/java/com/massivecraft/factions/cmd/check/CheckTask.java index 97134184..bcbac60e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/check/CheckTask.java +++ b/src/main/java/com/massivecraft/factions/cmd/check/CheckTask.java @@ -13,9 +13,9 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; public class CheckTask implements Runnable { - private SimpleDateFormat simpleDateFormat = new SimpleDateFormat(Conf.dateFormat); private static List wallChecks = new CopyOnWriteArrayList<>(); private static List bufferChecks = new CopyOnWriteArrayList<>(); + private SimpleDateFormat simpleDateFormat = new SimpleDateFormat(Conf.dateFormat); private P plugin; private int minute; @@ -43,6 +43,14 @@ public class CheckTask implements Runnable { } } + public static boolean wallCheck(String factionId) { + return CheckTask.wallChecks.remove(factionId); + } + + public static boolean bufferCheck(String factionId) { + return CheckTask.bufferChecks.remove(factionId); + } + @Override public void run() { long currentTime = System.currentTimeMillis(); @@ -86,13 +94,5 @@ public class CheckTask implements Runnable { } } - public static boolean wallCheck(String factionId) { - return CheckTask.wallChecks.remove(factionId); - } - - public static boolean bufferCheck(String factionId) { - return CheckTask.bufferChecks.remove(factionId); - } - } diff --git a/src/main/java/com/massivecraft/factions/cmd/check/WeeWooTask.java b/src/main/java/com/massivecraft/factions/cmd/check/WeeWooTask.java index a78317b5..68a12c95 100644 --- a/src/main/java/com/massivecraft/factions/cmd/check/WeeWooTask.java +++ b/src/main/java/com/massivecraft/factions/cmd/check/WeeWooTask.java @@ -20,6 +20,6 @@ public class WeeWooTask implements Runnable { continue; } faction.msg(TL.WEE_WOO_MESSAGE); - } } } +} diff --git a/src/main/java/com/massivecraft/factions/event/FPlayerRoleChangeEvent.java b/src/main/java/com/massivecraft/factions/event/FPlayerRoleChangeEvent.java index fdbec66a..3c4d13b7 100644 --- a/src/main/java/com/massivecraft/factions/event/FPlayerRoleChangeEvent.java +++ b/src/main/java/com/massivecraft/factions/event/FPlayerRoleChangeEvent.java @@ -7,12 +7,13 @@ import org.bukkit.event.Cancellable; /** * Represents {@link Role} change of a factions player + * * @see FPlayer#getRole() */ public class FPlayerRoleChangeEvent extends FactionPlayerEvent implements Cancellable { - private boolean cancelled; private final Role from; + private boolean cancelled; private Role to; public FPlayerRoleChangeEvent(Faction faction, FPlayer fPlayer, Role from, Role to) { diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index b9ef5b06..36b9b647 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -101,7 +101,7 @@ public class FactionsPlayerListener implements Listener { return false; } - if(me.getFaction() == otherFaction) return true; + if (me.getFaction() == otherFaction) return true; if (P.p.getConfig().getBoolean("hcf.raidable", false) && otherFaction.getLandRounded() > otherFaction.getPowerRounded()) { return true;