EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-01 12:05:27 +02:00
Code Issues Projects Releases Wiki Activity

Wire up Acrobatics XP config + PVP XP

Browse Source
This commit is contained in:
nossr50
2019-04-10 02:25:47 -07:00
parent 8ddbb3aa91
commit fb6e5e41ad
10 changed files with 61 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java
View File

@@ -3,13 +3,18 @@ package com.gmail.nossr50.skills.acrobatics;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.MainConfig;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.mcMMO;
public final class Acrobatics {
public static double dodgeDamageModifier = AdvancedConfig.getInstance().getDodgeDamageModifier();
public static int dodgeXpModifier = ExperienceConfig.getInstance().getDodgeXPModifier();
public static boolean dodgeLightningDisabled = MainConfig.getInstance().getDodgeLightningDisabled();
public static double dodgeDamageModifier;
public static int dodgeXpModifier;
// public static boolean dodgeLightningDisabled;
private Acrobatics() {}
private Acrobatics() {
dodgeDamageModifier = mcMMO.getConfigManager().getConfigAcrobatics().getDamageReductionDivisor();
dodgeXpModifier = mcMMO.getConfigManager().getExperienceConfig().getDodgeXPModifier();
// dodgeLightningDisabled = MainConfig.getInstance().getDodgeLightningDisabled();
}
protected static double calculateModifiedDodgeDamage(double damage, double damageModifier) {
return Math.max(damage / damageModifier, 1.0);

4
src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
View File

@@ -52,9 +52,9 @@ public class AcrobaticsManager extends SkillManager {
return false;
if (Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.ACROBATICS_DODGE)) {
if (damager instanceof LightningStrike && Acrobatics.dodgeLightningDisabled) {
/*if (damager instanceof LightningStrike && Acrobatics.dodgeLightningDisabled) {
return false;
}
}*/
return skill.shouldProcess(damager);
}