From 55c03d88faab6372650f41757d2ec02fbd61967b Mon Sep 17 00:00:00 2001 From: Blackdigits Date: Sun, 16 Feb 2020 02:03:13 +0700 Subject: [PATCH] add combat log timer make sure to add these to your config.yml #Timer for combat log to expire (in seconds) combat-log: timer: 10 --- .../java/net/Indyuce/mmocore/api/player/CombatRunnable.java | 2 +- src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java | 2 ++ src/main/resources/config.yml | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/Indyuce/mmocore/api/player/CombatRunnable.java b/src/main/java/net/Indyuce/mmocore/api/player/CombatRunnable.java index bac84f9c..b7092169 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/CombatRunnable.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/CombatRunnable.java @@ -29,7 +29,7 @@ public class CombatRunnable extends BukkitRunnable { @Override public void run() { - if (lastHit + 10000 < System.currentTimeMillis()) { + if (lastHit + (config.combatLogTimer * 100) < System.currentTimeMillis()) { Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, false)); config.getSimpleMessage("leave-combat").send(player.getPlayer()); close(); diff --git a/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java b/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java index 17e85ff3..02083b0b 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java @@ -30,6 +30,7 @@ public class ConfigManager { public double expPartyBuff, regenPartyBuff; public String partyChatPrefix; public ChatColor manaFull, manaHalf, manaEmpty, staminaFull, staminaHalf, staminaEmpty; + public int combatLogTimer; public final DecimalFormatSymbols formatSymbols = new DecimalFormatSymbols(); public final DecimalFormat decimal = new DecimalFormat("0.#", formatSymbols), decimals = new DecimalFormat("0.##", formatSymbols); @@ -100,6 +101,7 @@ public class ConfigManager { regenPartyBuff = MMOCore.plugin.getConfig().getDouble("party.buff.health-regen"); partyChatPrefix = MMOCore.plugin.getConfig().getString("party.chat-prefix"); formatSymbols.setDecimalSeparator(getFirstChar(MMOCore.plugin.getConfig().getString("number-format.decimal-separator"), ',')); + combatLogTimer = MMOCore.plugin.getConfig().getInt("combat-log.timer"); manaFull = getColorOrDefault("mana-whole", ChatColor.BLUE); manaHalf = getColorOrDefault("mana-half", ChatColor.AQUA); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index c20a1215..17ecf8e5 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -91,6 +91,10 @@ use-chat-input: true # Prevents mobs spawned from spawners from giving XP points. prevent-spawner-xp: true +#Timer for combat log to expire (in seconds) +combat-log: + timer: 10 + # Change this to the name of the color you want for # the different resource bar placeholders resource-bar-colors: