From 0fa680ae2f73ce2672249caa9585d21f89dc0fc8 Mon Sep 17 00:00:00 2001 From: Jules Date: Thu, 2 Feb 2023 16:15:35 +0100 Subject: [PATCH] Fixed action bar time out --- .../command/rpg/admin/HideActionBarCommandTreeNode.java | 2 +- .../java/net/Indyuce/mmocore/manager/ActionBarManager.java | 3 +-- MMOCore-Dist/src/main/resources/config.yml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java index 0b94207c..cd7d0993 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java @@ -36,7 +36,7 @@ public class HideActionBarCommandTreeNode extends CommandTreeNode { return CommandResult.FAILURE; } - long lastUsed = System.currentTimeMillis() - PlayerActivity.ACTION_BAR_MESSAGE.getTimeOut() + amount * 50; + final long lastUsed = System.currentTimeMillis() - PlayerActivity.ACTION_BAR_MESSAGE.getTimeOut() + amount * 50; PlayerData.get(player).setLastActivity(PlayerActivity.ACTION_BAR_MESSAGE, lastUsed); return CommandResult.SUCCESS; } diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/ActionBarManager.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/ActionBarManager.java index 93fa969c..86fccb43 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/ActionBarManager.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/ActionBarManager.java @@ -19,7 +19,7 @@ public class ActionBarManager extends BukkitRunnable { public void reload(ConfigurationSection config) { enabled = config.getBoolean("enabled", false); - timeOut = config.getInt("", 60); + timeOut = config.getInt("time-out", 60); updateTicks = config.getInt("ticks-to-update", 5); barFormat = config.getString("format", ""); @@ -43,7 +43,6 @@ public class ActionBarManager extends BukkitRunnable { Placeholders holders = getActionBarPlaceholders(data); data.getPlayer().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText( holders.apply(data.getPlayer(), data.getProfess().hasActionBar() ? data.getProfess().getActionBar() : barFormat))); - } } diff --git a/MMOCore-Dist/src/main/resources/config.yml b/MMOCore-Dist/src/main/resources/config.yml index 72fc5f5e..47b690a2 100644 --- a/MMOCore-Dist/src/main/resources/config.yml +++ b/MMOCore-Dist/src/main/resources/config.yml @@ -111,7 +111,7 @@ action-bar: # (This doesn't change any other action bars provided by MMOCore.) enabled: true - # The amount of milliseconds the bar will be + # The amount of ticks the bar will be # faded out when displaying other action bars. time-out: 60