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

'now-in-combat' and 'leave-combat' can now be empty.

Browse Source
This commit is contained in:
Aria 2019-09-16 15:06:16 +02:00
parent 36bfa5df68
commit 58a0e87f82
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,16 +5,20 @@ 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;
player.getPlayer().sendMessage(MMOCore.plugin.configManager.getSimpleMessage("now-in-combat")); config = MMOCore.plugin.configManager;
if(!config.getSimpleMessage("now-in-combat").isEmpty()) player.getPlayer().sendMessage(config.getSimpleMessage("now-in-combat"));
Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, true)); Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, true));
runTaskTimer(MMOCore.plugin, 20, 20); runTaskTimer(MMOCore.plugin, 20, 20);
} }
@ -27,7 +31,7 @@ public class CombatRunnable extends BukkitRunnable {
public void run() { public void run() {
if (lastHit + 10000 < System.currentTimeMillis()) { if (lastHit + 10000 < System.currentTimeMillis()) {
Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, false)); Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, false));
player.getPlayer().sendMessage(MMOCore.plugin.configManager.getSimpleMessage("leave-combat")); if(!config.getSimpleMessage("leave-combat").isEmpty()) player.getPlayer().sendMessage(config.getSimpleMessage("leave-combat"));
close(); close();
} }
} }