EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-01 21:24:43 +02:00
Code Issues Projects Releases Wiki Activity

Reworked the relationship between SubSkill and Locale keys

Browse Source
This commit is contained in:
nossr50
2019-01-04 07:58:39 -08:00
parent 6dc75760d0
commit 01a7aa4d12
60 changed files with 2118 additions and 2322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java
View File

@ -36,7 +36,7 @@ public class SwordsManager extends SkillManager {
}
public boolean canUseCounterAttack(Entity target) {
return target instanceof LivingEntity && Permissions.isSubSkillEnabled(getPlayer(), SubSkill.SWORDS_COUNTER);
return target instanceof LivingEntity && Permissions.isSubSkillEnabled(getPlayer(), SubSkill.SWORDS_COUNTER_ATTACK);
}
public boolean canUseSerratedStrike() {
@ -83,7 +83,7 @@ public class SwordsManager extends SkillManager {
return;
}
if (SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkill.SWORDS_COUNTER, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
if (SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkill.SWORDS_COUNTER_ATTACK, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
CombatUtils.dealDamage(attacker, damage / Swords.counterAttackModifier, getPlayer());
getPlayer().sendMessage(LocaleLoader.getString("Swords.Combat.Countered"));