Просмотр исходного кода

Fixing some Acrobatics related classes

nossr50 5 лет назад
Родитель
Сommit
32d9eaab3d

+ 1 - 1
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;

+ 4 - 1
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;

+ 2 - 2
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;
     }