From ab6dbe306d04e0d66fe5429d8a3128cab63bdb3c Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Wed, 19 Feb 2020 11:38:48 -0800
Subject: [PATCH] Fix potential NPE for salvage

---
 Changelog.txt                                                  | 3 ++-
 .../java/com/gmail/nossr50/skills/salvage/SalvageManager.java  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 232675755..53227539a 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -2,7 +2,8 @@ Version 2.1.115
     Fixed an issue with arrows causing exceptions with players not yet having data loaded
     Spectral arrows are now tracked by mcMMO
     Use minimum level of salvageable properly
-    Fix axes Critical Strikes default permissions
+    Fix Axes Critical Strikes default permissions ( new fixed permission: mcmmo.ability.axes.criticalstrikes )
+    Fix potential null pointer exception for salvage
 
 Version 2.1.114
     Fix some more locale usages, should aim to further prevent issues with oddball locales
diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
index 5d3cc1134..327cfcd95 100644
--- a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
@@ -66,7 +66,7 @@ public class SalvageManager extends SkillManager {
 
         Salvageable salvageable = mcMMO.getSalvageableManager().getSalvageable(item.getType());
 
-        if (item.getItemMeta().isUnbreakable()) {
+        if (item.getItemMeta() != null && item.getItemMeta().isUnbreakable()) {
             NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE_FAILED, "Anvil.Unbreakable");
             return;
         }