From 32d9eaab3de4e3b56d9bfc49675d52f670a07f42 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 25 Sep 2019 13:57:13 -0700 Subject: [PATCH] Fixing some Acrobatics related classes --- .../hocon/skills/coreskills/ConfigCoreSkillsAcrobatics.java | 2 +- .../nossr50/datatypes/skills/subskills/AbstractSubSkill.java | 5 ++++- .../skills/subskills/acrobatics/AcrobaticsSubSkill.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillsAcrobatics.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillsAcrobatics.java index 378cd7d93..e0d83e5e6 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillsAcrobatics.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/coreskills/ConfigCoreSkillsAcrobatics.java @@ -7,7 +7,7 @@ import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; public class ConfigCoreSkillsAcrobatics { private static final boolean ROLL_DEFAULT = true; - public static final boolean ACROBATICS_MASTER_DEFAULT = true; + private static final boolean ACROBATICS_MASTER_DEFAULT = true; @Setting(value = "Disable", comment = "Enable the primary skill Acrobatics") private boolean enableAcrobatics = ACROBATICS_MASTER_DEFAULT; diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java index 9d483be87..dea66af37 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java @@ -5,6 +5,7 @@ import com.gmail.nossr50.datatypes.skills.subskills.interfaces.Interaction; import com.gmail.nossr50.datatypes.skills.subskills.interfaces.Rank; import com.gmail.nossr50.datatypes.skills.subskills.interfaces.SubSkill; import com.gmail.nossr50.datatypes.skills.subskills.interfaces.SubSkillProperties; +import com.gmail.nossr50.mcMMO; import org.bukkit.entity.Player; public abstract class AbstractSubSkill implements SubSkill, Interaction, Rank, SubSkillProperties { @@ -14,8 +15,10 @@ public abstract class AbstractSubSkill implements SubSkill, Interaction, Rank, S protected String configKeySubSkill; protected String configKeyPrimary; protected SubSkillType subSkillType; + protected final mcMMO pluginRef; - public AbstractSubSkill(String configKeySubSkill, String configKeyPrimary, SubSkillType subSkillType) { + public AbstractSubSkill(mcMMO pluginRef, String configKeySubSkill, String configKeyPrimary, SubSkillType subSkillType) { + this.pluginRef = pluginRef; this.configKeySubSkill = configKeySubSkill; this.configKeyPrimary = configKeyPrimary; this.subSkillType = subSkillType; diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java index 7ac827933..3464d811c 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java @@ -13,8 +13,8 @@ public abstract class AcrobaticsSubSkill extends AbstractSubSkill { protected EventPriority interactionPriority; - public AcrobaticsSubSkill(String configKeySub, EventPriority interactionPriority, SubSkillType subSkillType) { - super(configKeySub, "Acrobatics", subSkillType); + public AcrobaticsSubSkill(mcMMO pluginRef, String configKeySub, EventPriority interactionPriority, SubSkillType subSkillType) { + super(pluginRef, configKeySub, "Acrobatics", subSkillType); this.interactionPriority = interactionPriority; }