SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code Overhaul + Minor Fixes

Browse Source
This commit is contained in:
Driftay
2019-04-16 09:02:31 -04:00
parent 7f53b52d1c
commit 8c6107859e
21 changed files with 116 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/massivecraft/factions/util/WarmUpUtil.java
View File

@@ -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);
}

24
src/main/java/com/massivecraft/factions/util/WarpGUI.java
View File

@@ -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));
}