summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-12-02 03:27:37 +0100
committersnowleo <schneeleo@gmail.com>2011-12-02 03:27:37 +0100
commitbfc90c610a53429ac5484743bed07374c8fcdd8b (patch)
tree91772fb757ed4caf148850698a7932c6ff3f0997
parenta020e0b9e65e791e7b24cfa08ec9abbdf9309762 (diff)
downloadEssentials-bfc90c610a53429ac5484743bed07374c8fcdd8b.tar
Essentials-bfc90c610a53429ac5484743bed07374c8fcdd8b.tar.gz
Essentials-bfc90c610a53429ac5484743bed07374c8fcdd8b.tar.lz
Essentials-bfc90c610a53429ac5484743bed07374c8fcdd8b.tar.xz
Essentials-bfc90c610a53429ac5484743bed07374c8fcdd8b.zip
Null check
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
index b5182b11b..ceda6a60c 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
@@ -29,13 +29,17 @@ public class EssentialsBlockListener extends BlockListener
// Do not rely on getItemInHand();
// http://leaky.bukkit.org/issues/663
final ItemStack is = Util.convertBlockToItem(event.getBlockPlaced());
+ if (is == null)
+ {
+ return;
+ }
boolean unlimitedForUser = user.hasUnlimited(is);
if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL)
{
ess.scheduleSyncDelayedTask(
new Runnable()
{
- @Override
+ @Override
public void run()
{
user.getInventory().addItem(is);