EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Removed Shake_UnlockLevel config option

Browse Source 
because it is no longer needed.
This commit is contained in:
TfT_02 2013-09-30 23:43:19 +02:00
parent 2eda3a9c83
commit 68eb51a3d0
5 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -67,6 +67,7 @@ Version 1.4.07-dev
! Mob healthbars are automatically disabled when the plugin "HealthBar" is found ! Mob healthbars are automatically disabled when the plugin "HealthBar" is found
- The /mmoupdate command has been removed. It is replaced by /mcconvert database - The /mmoupdate command has been removed. It is replaced by /mcconvert database
- Removed Abilities.Tools.Durability_Loss_Enabled, set Abilities.Tools.Durability_Loss to 0 to disable instead. - Removed Abilities.Tools.Durability_Loss_Enabled, set Abilities.Tools.Durability_Loss to 0 to disable instead.
- Removed Skills.Fishing.Shake_UnlockLevel from advanced.yml, now using Skills.Fishing.Rank_Levels.Rank_1 instead.
- Removed SpoutPlugin support - Removed SpoutPlugin support
Version 1.4.06 Version 1.4.06

2
src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
View File

@ -143,7 +143,7 @@ public class FishingCommand extends SkillCommand {
} }
if (canShake) { if (canShake) {
int unlockLevel = AdvancedConfig.getInstance().getShakeUnlockLevel(); int unlockLevel = AdvancedConfig.getInstance().getFishingTierLevelsTier1();
if (skillValue < unlockLevel) { if (skillValue < unlockLevel) {
player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", unlockLevel))); player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", unlockLevel)));

5
src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
View File

@ -213,10 +213,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
reason.add("Skills.Fishing.Ice_Fishing_UnlockLevel should be at least 1!"); reason.add("Skills.Fishing.Ice_Fishing_UnlockLevel should be at least 1!");
} }
if (getShakeUnlockLevel() < 1) {
reason.add("Skills.Fishing.Shake_UnlockLevel should be at least 1!");
}
if (getShakeChanceRank1() > getShakeChanceRank2()) { if (getShakeChanceRank1() > getShakeChanceRank2()) {
reason.add("Skills.Fishing.Shake_Chance.Rank_1 should be less or equal to Skills.Fishing.Shake_Chance.Rank_2!"); reason.add("Skills.Fishing.Shake_Chance.Rank_1 should be less or equal to Skills.Fishing.Shake_Chance.Rank_2!");
} }
@ -979,7 +975,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
public int getIceFishingUnlockLevel() { return config.getInt("Skills.Fishing.Ice_Fishing_UnlockLevel", 50); } public int getIceFishingUnlockLevel() { return config.getInt("Skills.Fishing.Ice_Fishing_UnlockLevel", 50); }
/* Shake */ /* Shake */
public int getShakeUnlockLevel() { return config.getInt("Skills.Fishing.Shake_UnlockLevel", 150); }
public double getShakeChanceRank1() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_1", 25.0D); } public double getShakeChanceRank1() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_1", 25.0D); }
public double getShakeChanceRank2() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_2", 25.0D); } public double getShakeChanceRank2() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_2", 25.0D); }
public double getShakeChanceRank3() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_3", 35.0D); } public double getShakeChanceRank3() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_3", 35.0D); }

2
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@ -68,7 +68,7 @@ public class FishingManager extends SkillManager {
} }
public boolean canShake(Entity target) { public boolean canShake(Entity target) {
return target instanceof LivingEntity && getSkillLevel() >= AdvancedConfig.getInstance().getShakeUnlockLevel() && Permissions.shake(getPlayer()); return target instanceof LivingEntity && getSkillLevel() >= AdvancedConfig.getInstance().getFishingTierLevelsTier1() && Permissions.shake(getPlayer());
} }
public boolean canMasterAngler() { public boolean canMasterAngler() {

3
src/main/resources/advanced.yml
View File

@ -116,9 +116,6 @@ Skills:
# Settings for Fishing # Settings for Fishing
### ###
Fishing: Fishing:
# Shake_UnlockLevel: Fishing level when the Shake ability unlocks
Shake_UnlockLevel: 150
# Rank_Levels: Fishing level where rank gets unlocked # Rank_Levels: Fishing level where rank gets unlocked
Rank_Levels: Rank_Levels:
Rank_1: 125 Rank_1: 125