From 900a534edb92984b70aaedf865da28e022150ac6 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 2 Jul 2020 21:04:06 -0700 Subject: [PATCH] Inventory NPE fix --- Changelog.txt | 3 +++ .../java/com/gmail/nossr50/listeners/InventoryListener.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 9ca00e66f..1f547c3f4 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,6 @@ +Version 2.1.132 + Fixed a NPE that could happen when players swapped items from their hotbar + Version 2.1.131 New permission node 'mcmmo.ability.repair.netheriterepair' which is included in the mcmmo.defaults permission package diff --git a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java index 064f799c3..161baacf8 100644 --- a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java @@ -435,8 +435,9 @@ public class InventoryListener implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onInventoryClickEvent(InventoryClickEvent event) { SkillUtils.removeAbilityBuff(event.getCurrentItem()); - if (event.getAction() == InventoryAction.HOTBAR_SWAP) { - SkillUtils.removeAbilityBuff(event.getWhoClicked().getInventory().getItem(event.getHotbarButton())); + if (event.getAction() == InventoryAction.HOTBAR_SWAP) {\ + if(event.getWhoClicked().getInventory().getItem(event.getHotbarButton()) != null) + SkillUtils.removeAbilityBuff(event.getWhoClicked().getInventory().getItem(event.getHotbarButton())); } }