Upstream/Harbor-Minecraft
1
0
Fork 0
mirror of https://github.com/nkomarn/harbor.git synced 2025-01-05 07:07:34 +01:00
Code Issues Projects Releases Wiki Activity

🧹 Cleanup + ignore vanished players in messages

Browse Source
This commit is contained in:
Mykyta 2020-04-19 10:35:12 -07:00
parent 737c9bdc40
commit 4524dc15f7
No known key found for this signature in database
GPG Key ID: C147E30C19EA3570
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/xyz/nkomarn/Harbor/command/HarborCommand.java
View File

@ -20,17 +20,17 @@ public class HarborCommand implements TabExecutor {
final String prefix = Config.getString("messages.miscellaneous.chat-prefix");
if (args.length < 1 || !sender.hasPermission("harbor.admin")) {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', prefix + "&7Harbor version "
+ Harbor.version + " by TechToolbox (@nkomarn)."));
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', String.format(
"%sHarbor version %s by TechToolbox (@nkomarn).", prefix, Harbor.version)));
} else if (args[0].equalsIgnoreCase("reload")) {
Harbor.getHarbor().reloadConfig();
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', prefix
+ "&7Reloaded configuration."));
+ "Reloaded configuration."));
}
else if (args[0].equalsIgnoreCase("forceskip")) {
if (!(sender instanceof Player)) {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', prefix
+ "&7This command requires you to be a player."));
+ "This command requires you to be a player."));
return true;
}
@ -39,14 +39,13 @@ public class HarborCommand implements TabExecutor {
if (Checker.skippingWorlds.contains(world)) {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', prefix
+ "&7This world's time is already being accelerated."));
return true;
+ "This world's time is already being accelerated."));
} else {
Checker.skippingWorlds.add(world);
new AccelerateNightTask(world).runTaskTimer(Harbor.getHarbor(), 0L, 1);
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', prefix
+ "Forcing night skip in your world."));
}
Checker.skippingWorlds.add(world);
new AccelerateNightTask(world).runTaskTimer(Harbor.getHarbor(), 0L, 1);
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', prefix
+ "&7Forcing night skip in your world."));
} else {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', prefix
+ Config.getString("messages.miscellaneous.unrecognized-command")));

2
src/main/java/xyz/nkomarn/Harbor/listener/BedListener.java
View File

@ -22,6 +22,7 @@ public class BedListener implements Listener {
public void onBedEnter(final PlayerBedEnterEvent event) {
if (event.getBedEnterResult() != PlayerBedEnterEvent.BedEnterResult.OK) return;
if (Checker.skippingWorlds.contains(event.getPlayer().getWorld())) return;
if (Checker.isVanished(event.getPlayer())) return;
Bukkit.getScheduler().runTaskLater(Harbor.getHarbor(), () -> {
final UUID playerUuid = event.getPlayer().getUniqueId();
@ -39,6 +40,7 @@ public class BedListener implements Listener {
@EventHandler(ignoreCancelled = true)
public void onBedLeave(final PlayerBedLeaveEvent event) {
if (Checker.skippingWorlds.contains(event.getPlayer().getWorld())) return;
if (Checker.isVanished(event.getPlayer())) return;
Bukkit.getScheduler().runTaskLater(Harbor.getHarbor(), () -> {
final UUID playerUuid = event.getPlayer().getUniqueId();