From e024f134a48107bc3f3e52c7639b3a9cf89c2df8 Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Thu, 1 Mar 2012 20:06:02 -0800
Subject: [PATCH] Fixed another NPE with the infinite stack remover.

---
 .../com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
index e214cfaa..8248634c 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
@@ -943,7 +943,7 @@ public void onItemHeldChange(PlayerItemHeldEvent event) {
                 && !plugin.hasPermission(player, "worldguard.override.infinite-stack")) {
             int newSlot = event.getNewSlot();
             ItemStack heldItem = player.getInventory().getItem(newSlot);
-            if (heldItem.getAmount() < 0) {
+            if (heldItem != null && heldItem.getAmount() < 0) {
                 player.getInventory().setItem(newSlot, null);
                 player.sendMessage(ChatColor.RED + "Infinite stack removed.");
             }