nossr50 6 سال پیش
والد
کامیت
7ab70ba597
3فایلهای تغییر یافته به همراه7 افزوده شده و 2 حذف شده
  1. 4 0
      Changelog.txt
  2. 1 1
      pom.xml
  3. 2 1
      src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java

+ 4 - 0
Changelog.txt

@@ -1,3 +1,7 @@
+Version 2.1.79
+    Updated Japanese locale (Thanks snake0053)
+    Fixed a NPE that could happen when using Tree Feller with an unenchanted Axe
+
 Version 2.1.78
 Version 2.1.78
     Shovels no longer take more than 1 diamond to repair
     Shovels no longer take more than 1 diamond to repair
     Tools with the unbreaking enchantment no longer take extra damage from ability usage, they are still subject to the normal durability damage from breaking blocks though.
     Tools with the unbreaking enchantment no longer take extra damage from ability usage, they are still subject to the normal durability damage from breaking blocks though.

+ 1 - 1
pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.78</version>
+    <version>2.1.79</version>
     <name>mcMMO</name>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
     <scm>

+ 2 - 1
src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java

@@ -149,7 +149,8 @@ public final class Woodcutting {
      */
      */
     protected static boolean handleDurabilityLoss(Set<BlockState> treeFellerBlocks, ItemStack inHand) {
     protected static boolean handleDurabilityLoss(Set<BlockState> treeFellerBlocks, ItemStack inHand) {
 
 
-        if(inHand.getItemMeta().getEnchants().get(Enchantment.DURABILITY) >= 1) {
+        if(inHand.getItemMeta().getEnchants().get(Enchantment.DURABILITY) != null
+                && inHand.getItemMeta().getEnchants().get(Enchantment.DURABILITY) >= 1) {
             return true;
             return true;
         }
         }