Przeglądaj źródła

Remove offhand fishing rod if not in main hand
Fixes mcMMO-Dev/mcMMO#3342
Fixed style error in last commit

ezeiger92 7 lat temu
rodzic
commit
6d2003d577

+ 3 - 0
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java

@@ -134,6 +134,9 @@ public class FishingManager extends SkillManager {
         if (player.getInventory().getItemInMainHand().getType() == Material.FISHING_ROD) {
         if (player.getInventory().getItemInMainHand().getType() == Material.FISHING_ROD) {
             player.getInventory().setItemInMainHand(null);
             player.getInventory().setItemInMainHand(null);
         }
         }
+        else if (player.getInventory().getItemInOffHand().getType() == Material.FISHING_ROD) {
+            player.getInventory().setItemInOffHand(null);
+        }
 
 
         LivingEntity kraken = (LivingEntity) world.spawnEntity(player.getEyeLocation(), (Misc.getRandom().nextInt(100) == 0 ? EntityType.CHICKEN : EntityType.SQUID));
         LivingEntity kraken = (LivingEntity) world.spawnEntity(player.getEyeLocation(), (Misc.getRandom().nextInt(100) == 0 ? EntityType.CHICKEN : EntityType.SQUID));
         kraken.setCustomName(AdvancedConfig.getInstance().getKrakenName());
         kraken.setCustomName(AdvancedConfig.getInstance().getKrakenName());

+ 1 - 1
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java

@@ -188,7 +188,7 @@ public class SkillUtils {
      * @param maxDamageModifier the amount to adjust the max damage by
      * @param maxDamageModifier the amount to adjust the max damage by
      */
      */
     public static void handleDurabilityChange(ItemStack itemStack, int durabilityModifier, double maxDamageModifier) {
     public static void handleDurabilityChange(ItemStack itemStack, int durabilityModifier, double maxDamageModifier) {
-        if(itemStack.hasItemMeta() && itemStack.getItemMeta().isUnbreakable()) {
+        if (itemStack.hasItemMeta() && itemStack.getItemMeta().isUnbreakable()) {
             return;
             return;
         }
         }