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

Fixed x2 cooldown issue

Browse Source
This commit is contained in:
Indyuce 2019-11-02 18:14:50 +01:00
parent 75344e2b6f
commit 35a8905179
3 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/Indyuce/mmocore/api/player/PlayerSkillData.java
View File

@ -28,6 +28,11 @@ public class PlayerSkillData {
this.data = data; this.data = data;
} }
/*
* any method which returns long RETURNS milliseconds (cooldowns are either
* stored in double when it's the actual value or in long when it's precise
* up to 3 digits)
*/
public long getCooldown(SkillInfo skill) { public long getCooldown(SkillInfo skill) {
return Math.max(0, lastCast(skill.getSkill()) + 1000 * (long) skill.getModifier("cooldown", data.getSkillLevel(skill.getSkill())) - System.currentTimeMillis()); return Math.max(0, lastCast(skill.getSkill()) + 1000 * (long) skill.getModifier("cooldown", data.getSkillLevel(skill.getSkill())) - System.currentTimeMillis());
} }

21
src/main/java/net/Indyuce/mmocore/listener/SpellCast.java
View File

@ -14,6 +14,7 @@ import org.bukkit.scheduler.BukkitRunnable;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.skill.Skill.SkillInfo;
public class SpellCast implements Listener { public class SpellCast implements Listener {
@EventHandler @EventHandler
@ -106,19 +107,25 @@ public class SpellCast implements Listener {
private String getFormat(PlayerData data) { private String getFormat(PlayerData data) {
String str = ""; String str = "";
for (int j = 0; j < data.getBoundSkills().size(); j++) for (int j = 0; j < data.getBoundSkills().size(); j++) {
str += (str.isEmpty() ? "" : split) + (onCooldown(data, j) && data.getBoundSkill(j).getSkill().hasModifier("cooldown") ? onCooldown.replace("{cooldown}", "" + ((int) data.getSkillData().getCooldown(data.getBoundSkill(j)) / 100) / 5) : SkillInfo skill = data.getBoundSkill(j);
noMana(data, j) ? noMana : ready).replace("{index}", "" + (j + 1 + (data.getPlayer().getInventory().getHeldItemSlot() <= j ? 1 : 0))).replace("{skill}", data.getBoundSkill(j).getSkill().getName()); str += (str.isEmpty() ? "" : split) + (onCooldown(data, skill) ? onCooldown.replace("{cooldown}", "" + data.getSkillData().getCooldown(skill) / 1000) : noMana(data, skill) ? noMana : ready).replace("{index}", "" + (j + 1 + (data.getPlayer().getInventory().getHeldItemSlot() <= j ? 1 : 0))).replace("{skill}", data.getBoundSkill(j).getSkill().getName());
}
return str; return str;
} }
private boolean onCooldown(PlayerData data, int index) { /*
return data.getBoundSkill(index).getSkill().hasModifier("cooldown") && data.getSkillData().getCooldown(data.getBoundSkill(index)) > 0; * no longer use index as arguments because data.getBoundSkill(int) has
* n-complexity, it has to iterate through a list. using skillInfo
* argument uses only one iteration
*/
private boolean onCooldown(PlayerData data, SkillInfo skill) {
return skill.getSkill().hasModifier("cooldown") && data.getSkillData().getCooldown(skill) > 0;
} }
private boolean noMana(PlayerData data, int index) { private boolean noMana(PlayerData data, SkillInfo skill) {
return data.getBoundSkill(index).getSkill().hasModifier("mana") && data.getBoundSkill(index).getModifier("mana", data.getSkillLevel(data.getBoundSkill(index).getSkill())) > data.getMana(); return skill.getSkill().hasModifier("mana") && skill.getModifier("mana", data.getSkillLevel(skill.getSkill())) > data.getMana();
} }
@Override @Override

19
src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java
View File

@ -185,19 +185,22 @@ public class ConfigManager {
} }
public class SimpleMessage { public class SimpleMessage {
String message; private final String message;
SimpleMessage(String m) { SimpleMessage(String message) {
message = m; this.message = message;
} }
public String message() public String message() {
{ return message.startsWith("%") ? message.substring(1) : message; } return message.startsWith("%") ? message.substring(1) : message;
}
public boolean send(Player player) { public boolean send(Player player) {
if(!message.isEmpty()) { if (!message.isEmpty()) {
if(message.startsWith("%")) PlayerData.get(player.getUniqueId()).displayActionBar(message.substring(1)); if (message.startsWith("%"))
else player.sendMessage(message); PlayerData.get(player.getUniqueId()).displayActionBar(message.substring(1));
else
player.sendMessage(message);
} }
return !message.isEmpty(); return !message.isEmpty();
} }