EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 05:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Inventory NPE fix

Browse Source
This commit is contained in:
nossr50 2020-07-02 21:04:06 -07:00
parent ce03e6613f
commit 900a534edb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@ -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

5
src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
View File

@ -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()));
}
}