Fork/mmocore
1
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Fixed combat log timer

Browse Source
This commit is contained in:
Jules 2020-02-21 17:36:09 +01:00
parent 1d79d80199
commit b444fac599
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/Indyuce/mmocore/api/player/CombatRunnable.java
View File

@ -5,20 +5,16 @@ import org.bukkit.scheduler.BukkitRunnable;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.event.PlayerCombatEvent; import net.Indyuce.mmocore.api.event.PlayerCombatEvent;
import net.Indyuce.mmocore.manager.ConfigManager;
public class CombatRunnable extends BukkitRunnable { public class CombatRunnable extends BukkitRunnable {
private final PlayerData player; private final PlayerData player;
private long lastHit = System.currentTimeMillis(); private long lastHit = System.currentTimeMillis();
private ConfigManager config;
public CombatRunnable(PlayerData player) { public CombatRunnable(PlayerData player) {
this.player = player; this.player = player;
config = MMOCore.plugin.configManager; MMOCore.plugin.configManager.getSimpleMessage("now-in-combat").send(player.getPlayer());
config.getSimpleMessage("now-in-combat").send(player.getPlayer());
Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, true)); Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, true));
runTaskTimer(MMOCore.plugin, 20, 20); runTaskTimer(MMOCore.plugin, 20, 20);
} }
@ -29,9 +25,9 @@ public class CombatRunnable extends BukkitRunnable {
@Override @Override
public void run() { public void run() {
if (lastHit + (config.combatLogTimer * 100) < System.currentTimeMillis()) { if (lastHit + (MMOCore.plugin.configManager.combatLogTimer * 1000) < System.currentTimeMillis()) {
Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, false)); Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, false));
config.getSimpleMessage("leave-combat").send(player.getPlayer()); MMOCore.plugin.configManager.getSimpleMessage("leave-combat").send(player.getPlayer());
close(); close();
} }
} }