From 8c6107859e1bca8d21169bafe4c564819ade0992 Mon Sep 17 00:00:00 2001 From: Driftay Date: Tue, 16 Apr 2019 09:02:31 -0400 Subject: [PATCH] Code Overhaul + Minor Fixes --- .../massivecraft/factions/cmd/CmdAdmin.java | 1 - .../factions/cmd/CmdCheckpoint.java | 7 +-- .../massivecraft/factions/cmd/CmdDisband.java | 7 +-- .../massivecraft/factions/cmd/CmdFWarp.java | 13 ++--- .../massivecraft/factions/cmd/CmdHome.java | 25 ++++----- .../massivecraft/factions/cmd/CmdList.java | 45 ++++++---------- .../massivecraft/factions/cmd/CmdReload.java | 1 - .../factions/cmd/CmdSeeChunk.java | 22 ++++---- .../factions/cmd/CmdShowClaims.java | 1 - .../com/massivecraft/factions/cmd/CmdTnt.java | 2 +- .../factions/cmd/CmdTpBanner.java | 9 +--- .../integration/dynmap/EngineDynmap.java | 33 ++++++------ .../listeners/FactionsBlockListener.java | 53 ++++++++----------- .../listeners/FactionsChatListener.java | 13 ++--- .../listeners/FactionsPlayerListener.java | 17 ++---- .../factions/scoreboards/FTeamWrapper.java | 9 ++-- .../factions/util/WarmUpUtil.java | 9 ++-- .../massivecraft/factions/util/WarpGUI.java | 24 ++++----- .../massivecraft/factions/zcore/MPlugin.java | 7 +-- .../factions/zcore/persist/MemoryFPlayer.java | 7 +-- .../factions/zcore/util/DiscUtil.java | 19 +++---- 21 files changed, 116 insertions(+), 208 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java b/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java index 7ca6c7cb..3f96623c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java @@ -19,7 +19,6 @@ public class CmdAdmin extends FCommand { this.aliases.add("setleader"); this.requiredArgs.add("player name"); - //this.optionalArgs.put("", ""); this.permission = Permission.ADMIN.node; this.disableOnLock = true; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdCheckpoint.java b/src/main/java/com/massivecraft/factions/cmd/CmdCheckpoint.java index fe153b0a..e779c51c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdCheckpoint.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdCheckpoint.java @@ -51,12 +51,7 @@ public class CmdCheckpoint extends FCommand { if (checkfaction.getId().equals(Factions.getInstance().getWilderness().getId()) || checkfaction.getId().equals(fme.getFaction().getId())) { fme.msg(TL.COMMAND_CHECKPOINT_GO); - this.doWarmUp(WarmUpUtil.Warmup.CHECKPOINT, TL.WARMUPS_NOTIFY_TELEPORT, "Checkpoint", new Runnable() { - @Override - public void run() { - fme.getPlayer().teleport(fme.getFaction().getCheckpoint()); - } - }, this.p.getConfig().getLong("warmups.f-checkpoint", 0)); + this.doWarmUp(WarmUpUtil.Warmup.CHECKPOINT, TL.WARMUPS_NOTIFY_TELEPORT, "Checkpoint", () -> fme.getPlayer().teleport(fme.getFaction().getCheckpoint()), this.p.getConfig().getLong("warmups.f-checkpoint", 0)); } else { fme.msg(TL.COMMAND_CHECKPOINT_CLAIMED); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java index 2f806816..06878515 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java @@ -81,12 +81,7 @@ public class CmdDisband extends FCommand { if (!disbandMap.containsKey(me.getUniqueId().toString()) && faction.getTnt() > 0) { msg(TL.COMMAND_DISBAND_CONFIRM.toString().replace("{tnt}", faction.getTnt() + "")); disbandMap.put(me.getUniqueId().toString(), faction.getId()); - Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, new Runnable() { - @Override - public void run() { - disbandMap.remove(me.getUniqueId().toString()); - } - }, 200L); + Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, () -> disbandMap.remove(me.getUniqueId().toString()), 200L); } else if (faction.getId().equals(disbandMap.get(me.getUniqueId().toString())) || faction.getTnt() == 0) { if (SavageFactions.plugin.getConfig().getBoolean("faction-disband-broadcast", true)) { for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java index de8c13cc..a6e19948 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java @@ -66,14 +66,11 @@ public class CmdFWarp extends FCommand { } final FPlayer fPlayer = fme; final UUID uuid = fme.getPlayer().getUniqueId(); - this.doWarmUp(WarmUpUtil.Warmup.WARP, TL.WARMUPS_NOTIFY_TELEPORT, warpName, new Runnable() { - @Override - public void run() { - Player player = Bukkit.getPlayer(uuid); - if (player != null) { - player.teleport(fPlayer.getFaction().getWarp(warpName).getLocation()); - fPlayer.msg(TL.COMMAND_FWARP_WARPED, warpName); - } + this.doWarmUp(WarmUpUtil.Warmup.WARP, TL.WARMUPS_NOTIFY_TELEPORT, warpName, () -> { + Player player = Bukkit.getPlayer(uuid); + if (player != null) { + player.teleport(fPlayer.getFaction().getWarp(warpName).getLocation()); + fPlayer.msg(TL.COMMAND_FWARP_WARPED, warpName); } }, this.p.getConfig().getLong("warmups.f-warp", 0)); } else { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java index e680f552..409072cd 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java @@ -123,21 +123,18 @@ public class CmdHome extends FCommand { return; } - this.doWarmUp(WarmUpUtil.Warmup.HOME, TL.WARMUPS_NOTIFY_TELEPORT, "Home", new Runnable() { - @Override - public void run() { - // Create a smoke effect - if (Conf.homesTeleportCommandSmokeEffectEnabled) { - List smokeLocations = new ArrayList<>(); - smokeLocations.add(loc); - smokeLocations.add(loc.add(0, 1, 0)); - smokeLocations.add(CmdHome.this.myFaction.getHome()); - smokeLocations.add(CmdHome.this.myFaction.getHome().clone().add(0, 1, 0)); - SmokeUtil.spawnCloudRandom(smokeLocations, Conf.homesTeleportCommandSmokeEffectThickness); - } - - CmdHome.this.me.teleport(CmdHome.this.myFaction.getHome()); + this.doWarmUp(WarmUpUtil.Warmup.HOME, TL.WARMUPS_NOTIFY_TELEPORT, "Home", () -> { + // Create a smoke effect + if (Conf.homesTeleportCommandSmokeEffectEnabled) { + List smokeLocations = new ArrayList<>(); + smokeLocations.add(loc); + smokeLocations.add(loc.add(0, 1, 0)); + smokeLocations.add(CmdHome.this.myFaction.getHome()); + smokeLocations.add(CmdHome.this.myFaction.getHome().clone().add(0, 1, 0)); + SmokeUtil.spawnCloudRandom(smokeLocations, Conf.homesTeleportCommandSmokeEffectThickness); } + + CmdHome.this.me.teleport(CmdHome.this.myFaction.getHome()); }, this.p.getConfig().getLong("warmups.f-home", 0)); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdList.java b/src/main/java/com/massivecraft/factions/cmd/CmdList.java index 46f75b2b..348ddefc 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdList.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdList.java @@ -52,43 +52,32 @@ public class CmdList extends FCommand { // remove exempt factions if (fme != null && fme.getPlayer() != null && !fme.getPlayer().hasPermission("factions.show.bypassexempt")) { List exemptFactions = SavageFactions.plugin.getConfig().getStringList("show-exempt"); - Iterator factionIterator = factionList.iterator(); - while (factionIterator.hasNext()) { - Faction next = factionIterator.next(); - if (exemptFactions.contains(next.getTag())) - factionIterator.remove(); - } + factionList.removeIf(next -> exemptFactions.contains(next.getTag())); } // Sort by total followers first - Collections.sort(factionList, new Comparator() { - @Override - public int compare(Faction f1, Faction f2) { - int f1Size = f1.getFPlayers().size(); - int f2Size = f2.getFPlayers().size(); - if (f1Size < f2Size) { - return 1; - } else if (f1Size > f2Size) { - return -1; - } - return 0; + Collections.sort(factionList, (f1, f2) -> { + int f1Size = f1.getFPlayers().size(); + int f2Size = f2.getFPlayers().size(); + if (f1Size < f2Size) { + return 1; + } else if (f1Size > f2Size) { + return -1; } + return 0; }); // Then sort by how many members are online now - Collections.sort(factionList, new Comparator() { - @Override - public int compare(Faction f1, Faction f2) { - int f1Size = f1.getFPlayersWhereOnline(true).size(); - int f2Size = f2.getFPlayersWhereOnline(true).size(); - if (f1Size < f2Size) { - return 1; - } else if (f1Size > f2Size) { - return -1; - } - return 0; + Collections.sort(factionList, (f1, f2) -> { + int f1Size = f1.getFPlayersWhereOnline(true).size(); + int f2Size = f2.getFPlayersWhereOnline(true).size(); + if (f1Size < f2Size) { + return 1; + } else if (f1Size > f2Size) { + return -1; } + return 0; }); ArrayList lines = new ArrayList<>(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java index 682fd9a3..32ef614b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java @@ -30,7 +30,6 @@ public class CmdReload extends FCommand { SavageFactions.plugin.reloadConfig(); SavageFactions.plugin.changeItemIDSInConfig(); SavageFactions.plugin.loadLang(); - int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]); if (SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight")) { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java b/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java index a32d1f38..56b2e9ca 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java @@ -17,9 +17,8 @@ public class CmdSeeChunk extends FCommand { //Used a hashmap cuz imma make a particle selection gui later, will store it where the boolean is rn. public static HashMap seeChunkMap = new HashMap<>(); - Long interval = 10L; + Long interval; private boolean useParticles; - private int length; private ParticleEffect effect; private int taskID = -1; @@ -72,18 +71,15 @@ public class CmdSeeChunk extends FCommand { } private void startTask() { - taskID = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, new Runnable() { - @Override - public void run() { - Iterator itr = seeChunkMap.keySet().iterator(); - while (itr.hasNext()) { - Object nameObject = itr.next(); - String name = nameObject + ""; - Player player = Bukkit.getPlayer(name); - showBorders(player); - } - manageTask(); + taskID = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, () -> { + Iterator itr = seeChunkMap.keySet().iterator(); + while (itr.hasNext()) { + Object nameObject = itr.next(); + String name = nameObject + ""; + Player player = Bukkit.getPlayer(name); + showBorders(player); } + manageTask(); }, 0, interval); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdShowClaims.java b/src/main/java/com/massivecraft/factions/cmd/CmdShowClaims.java index 20b6a2b2..4a9a8721 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdShowClaims.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdShowClaims.java @@ -39,7 +39,6 @@ public class CmdShowClaims extends FCommand { chunks.setLength(0); } } - sendMessage(""); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java b/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java index 77f0f55a..08e1d3ab 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java @@ -99,7 +99,7 @@ public class CmdTnt extends FCommand { return; } if (fme.getFaction().getTnt() < amount) { - fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH.toString()); + fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH); return; } int fullStacks = amount / 64; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdTpBanner.java b/src/main/java/com/massivecraft/factions/cmd/CmdTpBanner.java index 55f81229..54fcc806 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdTpBanner.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdTpBanner.java @@ -30,16 +30,9 @@ public class CmdTpBanner extends FCommand { return; } - final FactionsPlayerListener fpl = new FactionsPlayerListener(); - if (FactionsBlockListener.bannerLocations.containsKey(fme.getTag())) { fme.msg(TL.COMMAND_TPBANNER_SUCCESS); - this.doWarmUp(WarmUpUtil.Warmup.BANNER, TL.WARMUPS_NOTIFY_TELEPORT, "Banner", new Runnable() { - @Override - public void run() { - me.teleport(FactionsBlockListener.bannerLocations.get(fme.getTag())); - } - }, this.p.getConfig().getLong("warmups.f-banner", 0)); + this.doWarmUp(WarmUpUtil.Warmup.BANNER, TL.WARMUPS_NOTIFY_TELEPORT, "Banner", () -> me.teleport(FactionsBlockListener.bannerLocations.get(fme.getTag())), this.p.getConfig().getLong("warmups.f-banner", 0)); } else { fme.msg(TL.COMMAND_TPBANNER_NOTSET); } diff --git a/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java b/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java index 0f15ff22..047953bc 100644 --- a/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java +++ b/src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java @@ -113,27 +113,24 @@ public class EngineDynmap { } // Shedule non thread safe sync at the end! - Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, new Runnable() { - @Override - public void run() { + Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, () -> { - final Map homes = createHomes(); - final Map areas = createAreas(); - final Map> playerSets = createPlayersets(); + final Map homes = createHomes(); + final Map areas = createAreas(); + final Map> playerSets = createPlayersets(); - if (!updateCore()) { - return; - } - - // createLayer() is thread safe but it makes use of fields set in updateCore() so we must have it after. - if (!updateLayer(createLayer())) { - return; - } - - updateHomes(homes); - updateAreas(areas); - updatePlayersets(playerSets); + if (!updateCore()) { + return; } + + // createLayer() is thread safe but it makes use of fields set in updateCore() so we must have it after. + if (!updateLayer(createLayer())) { + return; + } + + updateHomes(homes); + updateAreas(areas); + updatePlayersets(playerSets); }, 100L, 100L); } diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java index 0ad77dc0..967b39f1 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java @@ -332,12 +332,7 @@ public class FactionsBlockListener implements Listener { as.setCustomNameVisible(true); //This makes the text appear no matter if your looking at the entity or not final ArmorStand armorStand = as; final String tag = fme.getTag(); - Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, new Runnable() { - @Override - public void run() { - bannerCooldownMap.remove(tag); - } - }, Long.parseLong(bannerCooldown + "")); + Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, () -> bannerCooldownMap.remove(tag), Long.parseLong(bannerCooldown + "")); final Block banner = e.getBlockPlaced(); final Material bannerType = banner.getType(); final Faction bannerFaction = fme.getFaction(); @@ -345,39 +340,33 @@ public class FactionsBlockListener implements Listener { // e.getPlayer().getWorld().playSound(e.getPlayer().getLocation(), Sound.ENTITY_LIGHTNING_IMPACT,2.0F,0.5F); final int radius = SavageFactions.plugin.getConfig().getInt("fbanners.Banner-Effect-Radius"); final List effects = SavageFactions.plugin.getConfig().getStringList("fbanners.Effects"); - final int affectorTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, new Runnable() { - @Override - public void run() { + final int affectorTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(SavageFactions.plugin, () -> { - for (Entity e : banner.getLocation().getWorld().getNearbyEntities(banner.getLocation(), radius, 255, radius)) { - if (e instanceof Player) { - Player player = (Player) e; - FPlayer fplayer = FPlayers.getInstance().getByPlayer(player); - if (fplayer.getFaction() == bannerFaction) { - for (String effect : effects) { - String[] components = effect.split(":"); - player.addPotionEffect(new PotionEffect(PotionEffectType.getByName(components[0]), 100, Integer.parseInt(components[1]))); - } - ParticleEffect.LAVA.display(1, 1, 1, 1, 10, banner.getLocation(), 16); - ParticleEffect.FLAME.display(1, 1, 1, 1, 10, banner.getLocation(), 16); + for (Entity e1 : banner.getLocation().getWorld().getNearbyEntities(banner.getLocation(), radius, 255, radius)) { + if (e1 instanceof Player) { + Player player = (Player) e1; + FPlayer fplayer = FPlayers.getInstance().getByPlayer(player); + if (fplayer.getFaction() == bannerFaction) { + for (String effect : effects) { + String[] components = effect.split(":"); + player.addPotionEffect(new PotionEffect(PotionEffectType.getByName(components[0]), 100, Integer.parseInt(components[1]))); + } + ParticleEffect.LAVA.display(1, 1, 1, 1, 10, banner.getLocation(), 16); + ParticleEffect.FLAME.display(1, 1, 1, 1, 10, banner.getLocation(), 16); - if (banner.getType() != bannerType) { - banner.setType(bannerType); - } + if (banner.getType() != bannerType) { + banner.setType(bannerType); } } } } }, 0L, 20L); - Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, new Runnable() { - @Override - public void run() { - banner.setType(Material.AIR); - as.remove(); - banner.getWorld().strikeLightningEffect(banner.getLocation()); - Bukkit.getScheduler().cancelTask(affectorTask); - bannerLocations.remove(bannerFaction.getTag()); - } + Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, () -> { + banner.setType(Material.AIR); + as.remove(); + banner.getWorld().strikeLightningEffect(banner.getLocation()); + Bukkit.getScheduler().cancelTask(affectorTask); + bannerLocations.remove(bannerFaction.getTag()); }, Long.parseLong(bannerTime + "")); } else { fme.msg(TL.WARBANNER_INVALIDLOC); diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java index e5a5065a..cfe44712 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsChatListener.java @@ -196,14 +196,11 @@ public class FactionsChatListener implements Listener { } private void doWarmup(final String warp, final FPlayer fme) { - WarmUpUtil.process(fme, WarmUpUtil.Warmup.WARP, TL.WARMUPS_NOTIFY_TELEPORT, warp, new Runnable() { - @Override - public void run() { - Player player = Bukkit.getPlayer(fme.getPlayer().getUniqueId()); - if (player != null) { - player.teleport(fme.getFaction().getWarp(warp).getLocation()); - fme.msg(TL.COMMAND_FWARP_WARPED, warp); - } + WarmUpUtil.process(fme, WarmUpUtil.Warmup.WARP, TL.WARMUPS_NOTIFY_TELEPORT, warp, () -> { + Player player = Bukkit.getPlayer(fme.getPlayer().getUniqueId()); + if (player != null) { + player.teleport(fme.getFaction().getWarp(warp).getLocation()); + fme.msg(TL.COMMAND_FWARP_WARPED, warp); } }, SavageFactions.plugin.getConfig().getLong("warmups.f-warp", 0)); } diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 78d60727..ffb4a587 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -296,12 +296,9 @@ public class FactionsPlayerListener implements Listener { me.login(); // set kills / deaths // Check for Faction announcements. Let's delay this so they actually see it. - Bukkit.getScheduler().runTaskLater(SavageFactions.plugin, new Runnable() { - @Override - public void run() { - if (me.isOnline()) { - me.getFaction().sendUnreadAnnouncements(me); - } + Bukkit.getScheduler().runTaskLater(SavageFactions.plugin, () -> { + if (me.isOnline()) { + me.getFaction().sendUnreadAnnouncements(me); } }, 33L); // Don't ask me why. @@ -322,13 +319,7 @@ public class FactionsPlayerListener implements Listener { fallMap.put(me.getPlayer(), false); - Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, new Runnable() { - @Override - public void run() { - fallMap.remove(me.getPlayer()); - - } - }, 180L); + Bukkit.getScheduler().scheduleSyncDelayedTask(SavageFactions.plugin, () -> fallMap.remove(me.getPlayer()), 180L); if (me.isSpyingChat() && !player.hasPermission(Permission.CHATSPY.node)) { diff --git a/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java b/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java index 88ee2663..20ca85c2 100644 --- a/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java +++ b/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java @@ -45,12 +45,9 @@ public class FTeamWrapper { if (updating.add(faction)) { - Bukkit.getScheduler().runTask(SavageFactions.plugin, new Runnable() { - @Override - public void run() { - updating.remove(faction); - applyUpdates(faction); - } + Bukkit.getScheduler().runTask(SavageFactions.plugin, () -> { + updating.remove(faction); + applyUpdates(faction); }); } } diff --git a/src/main/java/com/massivecraft/factions/util/WarmUpUtil.java b/src/main/java/com/massivecraft/factions/util/WarmUpUtil.java index bfd08ef6..2cc490e4 100644 --- a/src/main/java/com/massivecraft/factions/util/WarmUpUtil.java +++ b/src/main/java/com/massivecraft/factions/util/WarmUpUtil.java @@ -21,12 +21,9 @@ public class WarmUpUtil { player.msg(TL.WARMUPS_ALREADY); } else { player.msg(translationKey.format(action, delay)); - int id = SavageFactions.plugin.getServer().getScheduler().runTaskLater(SavageFactions.plugin, new Runnable() { - @Override - public void run() { - player.stopWarmup(); - runnable.run(); - } + int id = SavageFactions.plugin.getServer().getScheduler().runTaskLater(SavageFactions.plugin, () -> { + player.stopWarmup(); + runnable.run(); }, delay * 20).getTaskId(); player.addWarmup(warmup, id); } diff --git a/src/main/java/com/massivecraft/factions/util/WarpGUI.java b/src/main/java/com/massivecraft/factions/util/WarpGUI.java index 702c7a6f..46d2ee50 100644 --- a/src/main/java/com/massivecraft/factions/util/WarpGUI.java +++ b/src/main/java/com/massivecraft/factions/util/WarpGUI.java @@ -102,13 +102,10 @@ public class WarpGUI implements InventoryHolder, FactionGUI { } else { fme.setEnteringPassword(true, warp); fme.msg(TL.COMMAND_FWARP_PASSWORD_REQUIRED); - Bukkit.getScheduler().runTaskLater(SavageFactions.plugin, new Runnable() { - @Override - public void run() { - if (fme.isEnteringPassword()) { - fme.msg(TL.COMMAND_FWARP_PASSWORD_TIMEOUT); - fme.setEnteringPassword(false, ""); - } + Bukkit.getScheduler().runTaskLater(SavageFactions.plugin, () -> { + if (fme.isEnteringPassword()) { + fme.msg(TL.COMMAND_FWARP_PASSWORD_TIMEOUT); + fme.setEnteringPassword(false, ""); } }, SavageFactions.plugin.getConfig().getInt("fwarp-gui.password-timeout", 5) * 20); } @@ -116,14 +113,11 @@ public class WarpGUI implements InventoryHolder, FactionGUI { } private void doWarmup(final String warp) { - WarmUpUtil.process(fme, WarmUpUtil.Warmup.WARP, TL.WARMUPS_NOTIFY_TELEPORT, warp, new Runnable() { - @Override - public void run() { - Player player = Bukkit.getPlayer(fme.getPlayer().getUniqueId()); - if (player != null) { - player.teleport(fme.getFaction().getWarp(warp).getLocation()); - fme.msg(TL.COMMAND_FWARP_WARPED, warp); - } + WarmUpUtil.process(fme, WarmUpUtil.Warmup.WARP, TL.WARMUPS_NOTIFY_TELEPORT, warp, () -> { + Player player = Bukkit.getPlayer(fme.getPlayer().getUniqueId()); + if (player != null) { + player.teleport(fme.getFaction().getWarp(warp).getLocation()); + fme.msg(TL.COMMAND_FWARP_WARPED, warp); } }, SavageFactions.plugin.getConfig().getLong("warmups.f-warp", 0)); } diff --git a/src/main/java/com/massivecraft/factions/zcore/MPlugin.java b/src/main/java/com/massivecraft/factions/zcore/MPlugin.java index 865a7a4d..aec6ec10 100644 --- a/src/main/java/com/massivecraft/factions/zcore/MPlugin.java +++ b/src/main/java/com/massivecraft/factions/zcore/MPlugin.java @@ -278,12 +278,7 @@ public abstract class MPlugin extends JavaPlugin { } if (async) { - Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this, new Runnable() { - @Override - public void run() { - command.execute(sender, args); - } - }); + Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this, () -> command.execute(sender, args)); } else { command.execute(sender, args); } diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java index 647f4395..82021747 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java @@ -873,12 +873,7 @@ public abstract class MemoryFPlayer implements FPlayer { // Short task so we're just doing it in method. Not clean but eh. if (cooldown > 0) { setTakeFallDamage(false); - Bukkit.getScheduler().runTaskLater(SavageFactions.plugin, new Runnable() { - @Override - public void run() { - setTakeFallDamage(true); - } - }, 20L * cooldown); + Bukkit.getScheduler().runTaskLater(SavageFactions.plugin, () -> setTakeFallDamage(true), 20L * cooldown); } } diff --git a/src/main/java/com/massivecraft/factions/zcore/util/DiscUtil.java b/src/main/java/com/massivecraft/factions/zcore/util/DiscUtil.java index fcf2e7ca..c9671096 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/DiscUtil.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/DiscUtil.java @@ -80,17 +80,14 @@ public class DiscUtil { lock.unlock(); } } else { - Bukkit.getScheduler().runTaskAsynchronously(SavageFactions.plugin, new Runnable() { - @Override - public void run() { - lock.lock(); - try { - write(file, content); - } catch (IOException e) { - e.printStackTrace(); - } finally { - lock.unlock(); - } + Bukkit.getScheduler().runTaskAsynchronously(SavageFactions.plugin, () -> { + lock.lock(); + try { + write(file, content); + } catch (IOException e) { + e.printStackTrace(); + } finally { + lock.unlock(); } }); }