From f3837265db8943ccd39759fd49622c4816064a33 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 2 Apr 2019 23:03:48 -0700 Subject: [PATCH] 2.1.33 --- Changelog.txt | 5 +++++ pom.xml | 2 +- src/main/java/com/gmail/nossr50/config/Config.java | 2 -- .../gmail/nossr50/config/experience/ExperienceConfig.java | 2 ++ .../nossr50/datatypes/skills/subskills/acrobatics/Roll.java | 2 +- .../gmail/nossr50/skills/acrobatics/AcrobaticsManager.java | 5 +++++ src/main/resources/config.yml | 2 -- src/main/resources/experience.yml | 1 + 8 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 6d7a34f71..ede3a66f2 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -7,6 +7,11 @@ Key: ! Change - Removal +Version 2.1.33 + Renamed "Skills.Acrobatics.Prevent_AFK_Leveling" to "ExploitFix.Acrobatics" + ExploitFix.Acrobatics when set to false allows gaining XP in Acrobatics freely with no anti-grind measures + NOTE: The anti-grinding/exploit stuff is fully configurable in update 2.2 coming soon, this hotfix is to hold you over until that update comes out. + Version 2.1.32 Completely removed Fireworks from mcMMO because they lag Added 'General.AprilFoolsEvent' setting to config.yml to turn off April Fools diff --git a/pom.xml b/pom.xml index f68234d98..aa7abe70d 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.32 + 2.1.33 mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index 3d315485e..dde188ed4 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -547,8 +547,6 @@ public class Config extends AutoUpdateConfigLoader { public int getWoodcuttingGate() { return config.getInt("Skills.Woodcutting.Ability_Activation_Level_Gate", 10); } /* AFK Leveling */ - public boolean getAcrobaticsPreventAFK() { return config.getBoolean("Skills.Acrobatics.Prevent_AFK_Leveling", true); } - public int getAcrobaticsAFKMaxTries() { return config.getInt("Skills.Acrobatics.Max_Tries_At_Same_Location", 3); } public boolean getHerbalismPreventAFK() { return config.getBoolean("Skills.Herbalism.Prevent_AFK_Leveling", true); } /* Level Caps */ diff --git a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java index 6f4f86fb3..fdcb25198 100644 --- a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java +++ b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java @@ -145,6 +145,8 @@ public class ExperienceConfig extends AutoUpdateConfigLoader { public boolean isEndermanEndermiteFarmingPrevented() { return config.getBoolean("ExploitFix.EndermanEndermiteFarms", true); } public boolean isFishingExploitingPrevented() { return config.getBoolean("ExploitFix.Fishing", true); } + public boolean isAcrobaticsExploitingPrevented() { return config.getBoolean("ExploitFix.Acrobatics", true); } + /* Curve settings */ public FormulaType getFormulaType() { return FormulaType.getFormulaType(config.getString("Experience_Formula.Curve")); } public boolean getCumulativeCurveEnabled() { return config.getBoolean("Experience_Formula.Cumulative_Curve", false); } diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java index b29895927..0d349ecdf 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java @@ -272,7 +272,7 @@ public class Roll extends AcrobaticsSubSkill { * @return true if exploits are detected, false otherwise */ private boolean isExploiting(Player player) { - if (!Config.getInstance().getAcrobaticsPreventAFK()) { + if (!ExperienceConfig.getInstance().isAcrobaticsExploitingPrevented()) { return false; } diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java index 35abe80f7..4119a4829 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java @@ -1,5 +1,6 @@ package com.gmail.nossr50.skills.acrobatics; +import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.player.McMMOPlayer; @@ -14,6 +15,7 @@ import com.gmail.nossr50.util.skills.ParticleEffectUtils; import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.util.skills.SkillActivationType; import com.gmail.nossr50.util.skills.SkillUtils; +import com.sun.deploy.config.Config; import org.bukkit.entity.Entity; import org.bukkit.entity.LightningStrike; import org.bukkit.entity.Player; @@ -30,6 +32,9 @@ public class AcrobaticsManager extends SkillManager { public boolean canGainRollXP() { + if(!ExperienceConfig.getInstance().isAcrobaticsExploitingPrevented()) + return true; + if(System.currentTimeMillis() >= rollXPCooldown) { rollXPCooldown = System.currentTimeMillis() + rollXPInterval; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 5e87efdf5..1eae04589 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -312,8 +312,6 @@ Skills: Acrobatics: Enabled_For_PVP: true Enabled_For_PVE: true - Prevent_AFK_Leveling: true - Max_Tries_At_Same_Location: 3 Prevent_Dodge_Lightning: false # Prevent earning Acrobatics XP a few seconds after teleporting XP_After_Teleport_Cooldown: 5 diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml index 0e2f41b6b..a1ee620eb 100644 --- a/src/main/resources/experience.yml +++ b/src/main/resources/experience.yml @@ -26,6 +26,7 @@ ExploitFix: # Prevent many exploits related to fishing Fishing: true EndermanEndermiteFarms: true + Acrobatics: true Experience_Bars: # Turn this to false if you wanna disable XP bars Enable: true