EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 06:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Update changelog

Browse Source
This commit is contained in:
nossr50 2019-03-19 12:31:38 -07:00
parent ac04ca5c27
commit c01b8e4ad4
3 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -131,7 +131,7 @@ Version 2.2.0
removed the hardcore and vampirism commands, these are dangerous settings and should not be toggle-able (turn them on in your configs if you want to use them) removed the hardcore and vampirism commands, these are dangerous settings and should not be toggle-able (turn them on in your configs if you want to use them)
Removed the following config settings from various configs for doing nothing Removed the following config settings from various configs for doing nothing
Update_Check, Prefer_Beta Update_Check, Prefer_Beta, Ability_Activation_Level_Gate, Max_Tries_At_Same_Location, Prevent_AFK_Leveling, Items_Pickup_Disabled_Full_Inventory
Removed the following config settings for being unwanted Removed the following config settings for being unwanted
Config_Update_Overwrite, Tool_Mods_Enabled, Armor_Mods_Enabled, Block_Mods_Enabled, Entity_Mods_Enabled Config_Update_Overwrite, Tool_Mods_Enabled, Armor_Mods_Enabled, Block_Mods_Enabled, Entity_Mods_Enabled

16
src/main/java/com/gmail/nossr50/config/MainConfig.java
View File

@ -584,10 +584,6 @@ public class MainConfig extends ConfigValidated {
return getBooleanValue(SKILLS, ACROBATICS, PREVENT + DODGE + LIGHTNING); return getBooleanValue(SKILLS, ACROBATICS, PREVENT + DODGE + LIGHTNING);
} }
public int getXPAfterTeleportCooldown() {
return getIntValue(SKILLS, ACROBATICS, XP_AFTER_TELEPORT + COOLDOWN);
}
/* Alchemy */ /* Alchemy */
public boolean getEnabledForHoppers() { public boolean getEnabledForHoppers() {
return getBooleanValue(SKILLS, ALCHEMY, ENABLED + FOR_HOPPERS); return getBooleanValue(SKILLS, ALCHEMY, ENABLED + FOR_HOPPERS);
@ -673,10 +669,6 @@ public class MainConfig extends ConfigValidated {
return getBooleanValue(SKILLS, UNARMED, BLOCK_CRACKER, SMOOTH_BRICK_TO_CRACKED_BRICK); return getBooleanValue(SKILLS, UNARMED, BLOCK_CRACKER, SMOOTH_BRICK_TO_CRACKED_BRICK);
} }
public boolean getUnarmedItemPickupDisabled() {
return getBooleanValue(SKILLS, UNARMED, ITEM + PICKUP_DISABLED_FULL_INVENTORY);
}
public boolean getUnarmedItemsAsUnarmed() { public boolean getUnarmedItemsAsUnarmed() {
return getBooleanValue(SKILLS, UNARMED, ITEMS + AS + UNARMED); return getBooleanValue(SKILLS, UNARMED, ITEMS + AS + UNARMED);
} }
@ -716,14 +708,6 @@ public class MainConfig extends ConfigValidated {
} }
/* AFK Leveling */ /* AFK Leveling */
public boolean getAcrobaticsPreventAFK() {
return getBooleanValue(SKILLS, ACROBATICS, PREVENT_AFK + LEVELING);
}
public int getAcrobaticsAFKMaxTries() {
return getIntValue(SKILLS, ACROBATICS, MAX_TRIES_AT_SAME_LOCATION);
}
public boolean getHerbalismPreventAFK() { public boolean getHerbalismPreventAFK() {
return getBooleanValue(SKILLS, HERBALISM, PREVENT_AFK + LEVELING); return getBooleanValue(SKILLS, HERBALISM, PREVENT_AFK + LEVELING);
} }

5
src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java
View File

@ -1,7 +1,6 @@
package com.gmail.nossr50.datatypes.skills.subskills.acrobatics; package com.gmail.nossr50.datatypes.skills.subskills.acrobatics;
import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.MainConfig;
import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.LimitedSizeList; import com.gmail.nossr50.datatypes.LimitedSizeList;
import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.experience.XPGainReason;
@ -277,10 +276,6 @@ public class Roll extends AcrobaticsSubSkill {
* @return true if exploits are detected, false otherwise * @return true if exploits are detected, false otherwise
*/ */
private boolean isExploiting(Player player) { private boolean isExploiting(Player player) {
if (!MainConfig.getInstance().getAcrobaticsPreventAFK()) {
return false;
}
if (player.getInventory().getItemInMainHand().getType() == Material.ENDER_PEARL || player.isInsideVehicle()) { if (player.getInventory().getItemInMainHand().getType() == Material.ENDER_PEARL || player.isInsideVehicle()) {
return true; return true;
} }