2
0
Эх сурвалжийг харах

Rupture will now check your rank before activating

nossr50 6 жил өмнө
parent
commit
c6e1edee91

+ 3 - 3
src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java

@@ -32,8 +32,8 @@ public class SwordsManager extends SkillManager {
         return mcMMOPlayer.getToolPreparationMode(ToolType.SWORD) && Permissions.serratedStrikes(getPlayer());
     }
 
-    public boolean canUseBleed() {
-        return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.SWORDS_RUPTURE);
+    public boolean canUseRupture() {
+        return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.SWORDS_RUPTURE) && RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.SWORDS_RUPTURE);
     }
 
     public boolean canUseCounterAttack(Entity target) {
@@ -49,7 +49,7 @@ public class SwordsManager extends SkillManager {
      *
      * @param target The defending entity
      */
-    public void bleedCheck(LivingEntity target) {
+    public void ruptureCheck(LivingEntity target) {
         if (SkillUtils.isActivationSuccessful(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkillType.SWORDS_RUPTURE, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
 
             if (getSkillLevel() >= AdvancedConfig.getInstance().getMaxBonusLevel(SubSkillType.SWORDS_RUPTURE)) {

+ 2 - 2
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

@@ -54,8 +54,8 @@ public final class CombatUtils {
             mcMMOPlayer.checkAbilityActivation(PrimarySkillType.SWORDS);
         }
 
-        if (swordsManager.canUseBleed()) {
-            swordsManager.bleedCheck(target);
+        if (swordsManager.canUseRupture()) {
+            swordsManager.ruptureCheck(target);
         }
 
         if (swordsManager.canUseSerratedStrike()) {