From af02f16c27d86d6dbf0beb131371f0e2a5ab0ddd Mon Sep 17 00:00:00 2001 From: GiovanH Date: Fri, 11 May 2018 20:06:48 +0100 Subject: [PATCH] Checked for data existance before operating on data --- .../java/com/gmail/nossr50/listeners/PlayerListener.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index d2ab93e87..5070316f4 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -422,12 +422,17 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) public void onPlayerInteractLowest(PlayerInteractEvent event) { Player player = event.getPlayer(); + if (event.getHand() != EquipmentSlot.HAND || !UserManager.hasPlayerDataKey(player) || player.getGameMode() == GameMode.CREATIVE) { return; } - McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); + McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); //Must make sure that UserManager has player data first! + if (!mcMMOPlayer.getAbilityUse()) { //If the player has their ability use toggled off... + return; //Don't use an ability. + } + MiningManager miningManager = mcMMOPlayer.getMiningManager(); Block block = event.getClickedBlock(); ItemStack heldItem = player.getInventory().getItemInMainHand();