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

Commented out class triggers 2

Browse Source
This commit is contained in:
Indyuce 2022-02-12 11:07:02 +01:00
parent 3ef9011b9a
commit 0b734132e3
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/Indyuce/mmocore/MMOCore.java
View File

@ -276,7 +276,7 @@ public class MMOCore extends LuminePlugin {
Bukkit.getPluginManager().registerEvents(new FishingListener(), this); Bukkit.getPluginManager().registerEvents(new FishingListener(), this);
Bukkit.getPluginManager().registerEvents(new PlayerCollectStats(), this); Bukkit.getPluginManager().registerEvents(new PlayerCollectStats(), this);
Bukkit.getPluginManager().registerEvents(new PlayerPressKeyListener(), this); Bukkit.getPluginManager().registerEvents(new PlayerPressKeyListener(), this);
Bukkit.getPluginManager().registerEvents(new ClassTriggers(), this); // Bukkit.getPluginManager().registerEvents(new ClassTriggers(), this);
/* /*
* Initialize player data from all online players. This is very important to do * Initialize player data from all online players. This is very important to do

16
src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java
View File

@ -21,6 +21,8 @@ import net.Indyuce.mmocore.experience.droptable.ExperienceTable;
import net.Indyuce.mmocore.experience.provider.ExperienceDispenser; import net.Indyuce.mmocore.experience.provider.ExperienceDispenser;
import net.Indyuce.mmocore.experience.provider.MainExperienceDispenser; import net.Indyuce.mmocore.experience.provider.MainExperienceDispenser;
import net.Indyuce.mmocore.experience.source.type.ExperienceSource; import net.Indyuce.mmocore.experience.source.type.ExperienceSource;
import net.Indyuce.mmocore.player.playerclass.ClassTrigger;
import net.Indyuce.mmocore.player.playerclass.ClassTriggerType;
import net.Indyuce.mmocore.skill.ClassSkill; import net.Indyuce.mmocore.skill.ClassSkill;
import net.Indyuce.mmocore.skill.RegisteredSkill; import net.Indyuce.mmocore.skill.RegisteredSkill;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
@ -51,7 +53,10 @@ public class PlayerClass extends PostLoadObject implements ExperienceObject {
private final Map<StatType, LinearValue> stats = new HashMap<>(); private final Map<StatType, LinearValue> stats = new HashMap<>();
private final Map<String, ClassSkill> skills = new LinkedHashMap<>(); private final Map<String, ClassSkill> skills = new LinkedHashMap<>();
private final List<Subclass> subclasses = new ArrayList<>(); private final List<Subclass> subclasses = new ArrayList<>();
// private final Map<String, ClassTrigger> classTriggers = new HashMap<>();
@Deprecated
private final Map<String, ClassTrigger> classTriggers = new HashMap<>();
private final Map<PlayerResource, ResourceRegeneration> resourceHandlers = new HashMap<>(); private final Map<PlayerResource, ResourceRegeneration> resourceHandlers = new HashMap<>();
@Deprecated @Deprecated
@ -293,10 +298,11 @@ public class PlayerClass extends PostLoadObject implements ExperienceObject {
return options.containsKey(option) ? options.get(option) : option.getDefault(); return options.containsKey(option) ? options.get(option) : option.getDefault();
} }
// @Nullable @Nullable
// public ClassTrigger getClassTrigger(ClassTriggerType type) { @Deprecated
// return classTriggers.get(type); public ClassTrigger getClassTrigger(ClassTriggerType type) {
// } return classTriggers.get(type);
}
@Deprecated @Deprecated
public Set<String> getEventTriggers() { public Set<String> getEventTriggers() {

1
src/main/java/net/Indyuce/mmocore/player/playerclass/ClassTrigger.java
View File

@ -53,7 +53,6 @@ public class ClassTrigger {
return type; return type;
} }
@Deprecated
public SkillResult trigger(TriggerMetadata triggerMeta) { public SkillResult trigger(TriggerMetadata triggerMeta) {
return castableSkill.cast(triggerMeta); return castableSkill.cast(triggerMeta);
} }