forked from Upstream/mmocore
Bug Fixing
This commit is contained in:
parent
1908b1d83e
commit
b6ef6cd4de
@ -117,11 +117,6 @@ public class MMOCore extends JavaPlugin {
|
|||||||
MythicLib.plugin.getSkills().registerMechanic("stellium", config -> new StelliumMechanic(config));
|
MythicLib.plugin.getSkills().registerMechanic("stellium", config -> new StelliumMechanic(config));
|
||||||
MythicLib.plugin.getSkills().registerMechanic("mmocore_experience", config -> new ExperienceMechanic(config));
|
MythicLib.plugin.getSkills().registerMechanic("mmocore_experience", config -> new ExperienceMechanic(config));
|
||||||
|
|
||||||
//MMOCore Skills
|
|
||||||
MythicLib.plugin.getSkills().registerSkillHandler(new Ambers());
|
|
||||||
MythicLib.plugin.getSkills().registerSkillHandler(new Neptune_Gift());
|
|
||||||
MythicLib.plugin.getSkills().registerSkillHandler(new Sneaky_Picky());
|
|
||||||
|
|
||||||
// Register extra objective, drop items...
|
// Register extra objective, drop items...
|
||||||
if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null)
|
if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null)
|
||||||
loadManager.registerLoader(new WorldGuardMMOLoader());
|
loadManager.registerLoader(new WorldGuardMMOLoader());
|
||||||
|
@ -11,6 +11,7 @@ import net.Indyuce.mmocore.api.player.PlayerData;
|
|||||||
import net.Indyuce.mmocore.skill.ClassSkill;
|
import net.Indyuce.mmocore.skill.ClassSkill;
|
||||||
import net.Indyuce.mmocore.skill.cast.PlayerKey;
|
import net.Indyuce.mmocore.skill.cast.PlayerKey;
|
||||||
import net.Indyuce.mmocore.skill.cast.SkillCastingHandler;
|
import net.Indyuce.mmocore.skill.cast.SkillCastingHandler;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.GameMode;
|
import org.bukkit.GameMode;
|
||||||
import org.bukkit.configuration.ConfigurationSection;
|
import org.bukkit.configuration.ConfigurationSection;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@ -116,13 +117,13 @@ public class SkillBar implements Listener {
|
|||||||
private String getFormat(PlayerData data) {
|
private String getFormat(PlayerData data) {
|
||||||
StringBuilder str = new StringBuilder();
|
StringBuilder str = new StringBuilder();
|
||||||
if (!data.isOnline()) return str.toString();
|
if (!data.isOnline()) return str.toString();
|
||||||
for (int j = 0; j < data.getBoundSkills().size(); j++) {
|
for (int slot : data.mapBoundSkills().keySet()) {
|
||||||
ClassSkill skill = data.getBoundSkill(j);
|
ClassSkill skill = data.getBoundSkill(slot);
|
||||||
str.append((str.length() == 0) ? "" : split).append((onCooldown(data, skill) ? onCooldown.replace("{cooldown}",
|
str.append((str.length() == 0) ? "" : split).append((onCooldown(data, skill) ? onCooldown.replace("{cooldown}",
|
||||||
String.valueOf(data.getCooldownMap().getInfo(skill).getRemaining() / 1000)) : noMana(data, skill) ? noMana : (noStamina(
|
String.valueOf(data.getCooldownMap().getInfo(skill).getRemaining() / 1000)) : noMana(data, skill) ? noMana : (noStamina(
|
||||||
data, skill) ? noStamina : ready)).replace("{index}",
|
data, skill) ? noStamina : ready)).replace("{index}",
|
||||||
"" + (j + 1 + (data.getPlayer().getInventory().getHeldItemSlot() <= j ? 1 : 0)))
|
"" + (slot + 1 + (data.getPlayer().getInventory().getHeldItemSlot() <= slot ? 1 : 0)))
|
||||||
.replace("{skill}", data.getBoundSkill(j).getSkill().getName()));
|
.replace("{skill}", data.getBoundSkill(slot).getSkill().getName()));
|
||||||
}
|
}
|
||||||
return MMOCore.plugin.placeholderParser.parse(data.getPlayer(), str.toString());
|
return MMOCore.plugin.placeholderParser.parse(data.getPlayer(), str.toString());
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,42 @@
|
|||||||
|
name: Arcane Hail
|
||||||
|
lore:
|
||||||
|
- Surprise your foes with this
|
||||||
|
- quick firing hail of magic
|
||||||
|
- ''
|
||||||
|
- '&e{cooldown}s Cooldown'
|
||||||
|
- '&9Costs {mana} {mana_name}'
|
||||||
|
material: END_ROD
|
||||||
|
duration:
|
||||||
|
base: 4
|
||||||
|
per-level: 1
|
||||||
|
min: 0
|
||||||
|
max: 0
|
||||||
|
timer:
|
||||||
|
base: 0
|
||||||
|
per-level: 0
|
||||||
|
min: 0
|
||||||
|
max: 0
|
||||||
|
damage:
|
||||||
|
base: 3
|
||||||
|
per-level: 1
|
||||||
|
delay:
|
||||||
|
base: 2
|
||||||
|
per-level: 1
|
||||||
|
min: 0
|
||||||
|
max: 0
|
||||||
|
mana:
|
||||||
|
base: 2
|
||||||
|
per-level: 1.1
|
||||||
|
stamina:
|
||||||
|
base: 0
|
||||||
|
per-level: 0
|
||||||
|
min: 0
|
||||||
|
max: 0
|
||||||
|
cooldown:
|
||||||
|
base: 1
|
||||||
|
per-level: -0.2
|
||||||
|
radius:
|
||||||
|
base: 4
|
||||||
|
per-level: 0.5
|
||||||
|
min: 0
|
||||||
|
max: 0
|
Loading…
Reference in New Issue
Block a user