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

Fixed %mmocore_in_combat%

Browse Source
This commit is contained in:
Jules 2023-03-18 21:20:43 +01:00
parent a84d240a4e
commit e1011d449f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MMOCore-API/src/main/java/net/Indyuce/mmocore/player/CombatHandler.java
View File

@ -33,15 +33,20 @@ public class CombatHandler implements Closable {
// Simply refreshing // Simply refreshing
if (isInCombat()) { if (isInCombat()) {
Bukkit.getScheduler().cancelTask(task.getTaskId()); Bukkit.getScheduler().cancelTask(task.getTaskId());
task = Bukkit.getScheduler().runTaskLater(MMOCore.plugin, () -> quit(false), MMOCore.plugin.configManager.combatLogTimer / 50); task = newTask();
// Entering combat // Entering combat
} else { } else {
MMOCore.plugin.configManager.getSimpleMessage("now-in-combat").send(player.getPlayer()); MMOCore.plugin.configManager.getSimpleMessage("now-in-combat").send(player.getPlayer());
Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, true)); Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, true));
task = newTask();
} }
} }
private BukkitTask newTask() {
return Bukkit.getScheduler().runTaskLater(MMOCore.plugin, () -> quit(false), MMOCore.plugin.configManager.combatLogTimer / 50);
}
public boolean isInPvpMode() { public boolean isInPvpMode() {
return pvpMode; return pvpMode;
} }