Explorar o código

Minor cleanup

bm01 %!s(int64=12) %!d(string=hai) anos
pai
achega
1633617006

+ 2 - 2
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java

@@ -77,7 +77,7 @@ public class HerbalismManager extends SkillManager {
      * @return the modified change in hunger for the event
      * @return the modified change in hunger for the event
      */
      */
     public int farmersDiet(int rankChange, int eventFoodLevel) {
     public int farmersDiet(int rankChange, int eventFoodLevel) {
-        return SkillUtils.handleFoodSkills(getPlayer(), SkillType.HERBALISM, eventFoodLevel, Herbalism.farmersDietRankLevel1, Herbalism.farmersDietMaxLevel, rankChange);
+        return SkillUtils.handleFoodSkills(getPlayer(), skill, eventFoodLevel, Herbalism.farmersDietRankLevel1, Herbalism.farmersDietMaxLevel, rankChange);
     }
     }
 
 
     /**
     /**
@@ -342,6 +342,6 @@ public class HerbalismManager extends SkillManager {
     }
     }
 
 
     private byte getGreenThumbStage() {
     private byte getGreenThumbStage() {
-        return (byte) Math.min(Math.min(getProfile().getSkillLevel(SkillType.HERBALISM), Herbalism.greenThumbStageMaxLevel) / Herbalism.greenThumbStageChangeLevel, 4);
+        return (byte) Math.min(Math.min(getProfile().getSkillLevel(skill), Herbalism.greenThumbStageMaxLevel) / Herbalism.greenThumbStageChangeLevel, 4);
     }
     }
 }
 }

+ 3 - 1
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java

@@ -66,9 +66,11 @@ public class MiningManager extends SkillManager{
             return;
             return;
         }
         }
 
 
+        boolean skillTouch = player.getItemInHand().containsEnchantment(Enchantment.SILK_TOUCH);
+
         for (int i = mcMMOPlayer.getAbilityMode(skill.getAbility()) ? 2 : 1; i != 0; i--) {
         for (int i = mcMMOPlayer.getAbilityMode(skill.getAbility()) ? 2 : 1; i != 0; i--) {
             if (SkillUtils.activationSuccessful(getSkillLevel(), getActivationChance(), Mining.doubleDropsMaxChance, Mining.doubleDropsMaxLevel)) {
             if (SkillUtils.activationSuccessful(getSkillLevel(), getActivationChance(), Mining.doubleDropsMaxChance, Mining.doubleDropsMaxLevel)) {
-                if (player.getItemInHand().containsEnchantment(Enchantment.SILK_TOUCH)) {
+                if (skillTouch) {
                     Mining.handleSilkTouchDrops(blockState);
                     Mining.handleSilkTouchDrops(blockState);
                 }
                 }
                 else {
                 else {