From 5b320cb88f3f773ed6af575a5f3dc4f4af8ffb6d Mon Sep 17 00:00:00 2001 From: Aria Date: Mon, 25 Nov 2019 15:51:23 +0100 Subject: [PATCH] Fixed action bar hiding and Mob Holograms. --- .../java/net/Indyuce/mmocore/api/PlayerActionBar.java | 2 +- .../api/experience/source/type/ExperienceSource.java | 2 +- .../java/net/Indyuce/mmocore/api/player/PlayerData.java | 8 ++++---- .../command/rpg/admin/HideActionBarCommandMap.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/Indyuce/mmocore/api/PlayerActionBar.java b/src/main/java/net/Indyuce/mmocore/api/PlayerActionBar.java index ee97866a..5f3f4eee 100644 --- a/src/main/java/net/Indyuce/mmocore/api/PlayerActionBar.java +++ b/src/main/java/net/Indyuce/mmocore/api/PlayerActionBar.java @@ -14,7 +14,7 @@ import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.TextComponent; public class PlayerActionBar extends BukkitRunnable { -private final int ticks; + private final int ticks; private final DecimalFormat digit; private final String format; diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/source/type/ExperienceSource.java b/src/main/java/net/Indyuce/mmocore/api/experience/source/type/ExperienceSource.java index ffd3ea1d..d1f44567 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/source/type/ExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/source/type/ExperienceSource.java @@ -48,6 +48,6 @@ public abstract class ExperienceSource { if (hasProfession()) player.getCollectionSkills().giveExperience(profession, amount, location == null ? player.getPlayer().getLocation() : location); else - player.giveExperience(amount, player.getPlayer().getLocation()); + player.giveExperience(amount, location == null ? player.getPlayer().getLocation() : location); } } diff --git a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java index 47269a6a..b19b9868 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java @@ -588,15 +588,15 @@ public class PlayerData { * if the general info action bar can be displayed */ public boolean canSeeActionBar() { - return actionBarTimeOut + 100 < System.currentTimeMillis(); + return actionBarTimeOut < System.currentTimeMillis(); } - public void setActionBarTimeOut(long actionBarTimeOut) { - this.actionBarTimeOut = actionBarTimeOut; + public void setActionBarTimeOut(long timeOut) { + actionBarTimeOut = System.currentTimeMillis() + (timeOut * 50); } public void displayActionBar(String message) { - actionBarTimeOut = System.currentTimeMillis(); + setActionBarTimeOut(60); player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(message)); } diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandMap.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandMap.java index 1cf763b6..30227577 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandMap.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandMap.java @@ -37,7 +37,7 @@ public class HideActionBarCommandMap extends CommandEnd { return CommandResult.FAILURE; } - PlayerData.get(player).setActionBarTimeOut(System.currentTimeMillis() - 100 + amount * 50); + PlayerData.get(player).setActionBarTimeOut(amount); return CommandResult.SUCCESS; } }