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

Fix cooldown reduction

Browse Source
This commit is contained in:
Indyuce 2019-11-03 00:23:24 +01:00
parent 3418a02ffa
commit 270a552abc
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
View File

@ -311,7 +311,7 @@ public class PlayerData {
public boolean inGuild() { public boolean inGuild() {
return guild != null; return guild != null;
} }
public boolean isOnline() { public boolean isOnline() {
return player.isOnline(); return player.isOnline();
} }
@ -325,7 +325,7 @@ public class PlayerData {
int total = 0; int total = 0;
while (value-- > 0) while (value-- > 0)
total += MMOCore.plugin.configManager.getNeededExperience(getLevel() + value + 1); total += MMOCore.plugin.configManager.getNeededExperience(getLevel() + value + 1);
giveExperience(total); giveExperience(total);
} }
public void setExperience(int value) { public void setExperience(int value) {
@ -393,8 +393,7 @@ public class PlayerData {
} }
public void heal(double heal) { public void heal(double heal) {
getPlayer().setHealth(Math.max(0, getPlayer().setHealth(Math.max(0, Math.min(player.getHealth() + heal, player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue())));
Math.min(player.getHealth() + heal, player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue())));
} }
public void addFriend(UUID uuid) { public void addFriend(UUID uuid) {
@ -448,7 +447,7 @@ public class PlayerData {
cancel(); cancel();
return; return;
} }
MMOCore.plugin.configManager.getSimpleMessage("warping-comencing", "left", "" + ((120 - t) / 20)).send(player); MMOCore.plugin.configManager.getSimpleMessage("warping-comencing", "left", "" + ((120 - t) / 20)).send(player);
if (t++ >= 100) { if (t++ >= 100) {
player.teleport(waypoint.getLocation()); player.teleport(waypoint.getLocation());
@ -483,7 +482,7 @@ public class PlayerData {
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) if (event.isCancelled())
return; return;
experience += event.getExperience(); experience += event.getExperience();
int needed; int needed;
@ -521,7 +520,8 @@ public class PlayerData {
public void giveMana(double amount) { public void giveMana(double amount) {
if (mana != (mana = Math.max(0, Math.min(getStats().getStat(StatType.MAX_MANA), mana + amount)))) if (mana != (mana = Math.max(0, Math.min(getStats().getStat(StatType.MAX_MANA), mana + amount))))
if(MMOCore.plugin.getConfig().getBoolean("display.mana")) displayMana(); if (MMOCore.plugin.getConfig().getBoolean("display.mana"))
displayMana();
} }
public void giveStamina(double amount) { public void giveStamina(double amount) {
@ -578,7 +578,7 @@ public class PlayerData {
public void displayActionBar(String message) { public void displayActionBar(String message) {
MMOCore.plugin.pauseDefaultActionBar(uuid, 60); MMOCore.plugin.pauseDefaultActionBar(uuid, 60);
lastActionbarUpdate = System.currentTimeMillis(); lastActionbarUpdate = System.currentTimeMillis();
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(message)); player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(message));
} }
@ -590,9 +590,8 @@ public class PlayerData {
public void displayMana() { public void displayMana() {
if (System.currentTimeMillis() > lastActionbarUpdate + 1200) if (System.currentTimeMillis() > lastActionbarUpdate + 1200)
MMOCore.plugin.pauseDefaultActionBar(uuid, 60); MMOCore.plugin.pauseDefaultActionBar(uuid, 60);
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(getProfess().getManaDisplay().generateBar(getMana(), getStats().getStat(StatType.MAX_MANA)))); player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(getProfess().getManaDisplay().generateBar(getMana(), getStats().getStat(StatType.MAX_MANA))));
} }
public void setAttributes(PlayerAttribute attribute, int value) { public void setAttributes(PlayerAttribute attribute, int value) {
setAttributes(attribute.getId(), value); setAttributes(attribute.getId(), value);
@ -756,7 +755,13 @@ public class PlayerData {
} }
if (!nocd) { if (!nocd) {
skillData.setLastCast(cast.getSkill(), System.currentTimeMillis() + (long) (getStats().getStat(StatType.COOLDOWN_REDUCTION) * cast.getCooldown() * 10));
// calculate skill cooldown reduction only if stat is higher than 0
// to save performance
double red = getStats().getStat(StatType.COOLDOWN_REDUCTION) * 10;
red *= red > 0 ? skill.getModifier("cooldown", getSkillLevel(skill.getSkill())) : 0;
skillData.setLastCast(cast.getSkill(), System.currentTimeMillis() - (long) red);
giveMana(-cast.getManaCost()); giveMana(-cast.getManaCost());
} }