From 8e9744f02b0977c37a16cd155edc00bfd851f1dc Mon Sep 17 00:00:00 2001 From: Indyuce Date: Thu, 2 Apr 2020 12:25:26 +0200 Subject: [PATCH] !Removed unused stuff --- .../Indyuce/mmocore/api/player/PlayerSkillData.java | 10 +++++----- .../net/Indyuce/mmocore/listener/PlayerListener.java | 11 +++++------ src/main/java/net/Indyuce/mmocore/skill/Ambers.java | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/Indyuce/mmocore/api/player/PlayerSkillData.java b/src/main/java/net/Indyuce/mmocore/api/player/PlayerSkillData.java index 6016f1a0..543a765c 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/PlayerSkillData.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/PlayerSkillData.java @@ -5,8 +5,8 @@ import java.util.Iterator; import java.util.Map; import net.Indyuce.mmocore.api.skill.Skill; -import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.skill.Skill.SkillInfo; +import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.comp.mythicmobs.MythicMobSkill; public class PlayerSkillData { @@ -22,7 +22,7 @@ public class PlayerSkillData { */ private final Map cache = new HashMap<>(); - public int ambers; + // public int ambers; public PlayerSkillData(PlayerData data) { this.data = data; @@ -53,9 +53,9 @@ public class PlayerSkillData { cooldowns.put(skill.getSkill().getId(), lastCast(skill.getSkill()) + (long) (relative ? value * getCooldown(skill) : value * 1000)); } - public void resetData() { - ambers = 0; - } + // public void resetData() { + // ambers = 0; + // } public int getCachedModifier(String name) { return cache.containsKey(name) ? cache.get(name).getValue() : 0; diff --git a/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java b/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java index 2d277367..fa1fba62 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java +++ b/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java @@ -16,7 +16,6 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.event.PlayerCombatEvent; import net.Indyuce.mmocore.api.event.PlayerRegenResourceEvent; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource; @@ -77,11 +76,11 @@ public class PlayerListener implements Listener { /* * reset skill data when leaving combat */ - @EventHandler - public void f(PlayerCombatEvent event) { - if (!event.entersCombat()) - event.getData().getSkillData().resetData(); - } + // @EventHandler + // public void f(PlayerCombatEvent event) { + // if (!event.entersCombat()) + // event.getData().getSkillData().resetData(); + // } /* * Warning: this really is not the best way to interface with MMOCore diff --git a/src/main/java/net/Indyuce/mmocore/skill/Ambers.java b/src/main/java/net/Indyuce/mmocore/skill/Ambers.java index c949d96f..9016bc4c 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Ambers.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Ambers.java @@ -72,7 +72,7 @@ public class Ambers extends Skill implements Listener { if (data.getPlayer().getLocation().distanceSquared(loc) < 2) { data.getPlayer().playSound(data.getPlayer().getLocation(), Sound.BLOCK_END_PORTAL_FRAME_FILL, 1, 1); - data.getSkillData().ambers++; + // data.getSkillData().ambers++; data.giveMana((data.getStats().getStat(StatType.MAX_MANA) - data.getMana()) * .15); cancel();