From 7ab70ba597b88f59f5d7b8de2e6bf613209eaa79 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Wed, 12 Jun 2019 11:05:16 -0700
Subject: [PATCH] 2.1.79

---
 Changelog.txt                                                 | 4 ++++
 pom.xml                                                       | 2 +-
 .../com/gmail/nossr50/skills/woodcutting/Woodcutting.java     | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index b78f2a067..e1ca54312 100644
--- a/Changelog.txt
+++ b/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
     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.
diff --git a/pom.xml b/pom.xml
index bdabf70d4..19bafd5c1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.78</version>
+    <version>2.1.79</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java b/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java
index bae5b12dd..ff9039365 100644
--- a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java
+++ b/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) {
 
-        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;
         }