From d8199aaa394b4f041dbfce08813f4f6ff271eb45 Mon Sep 17 00:00:00 2001 From: feildmaster Date: Mon, 4 Jun 2012 00:23:10 -0500 Subject: Fix a NullPointerException. --- src/main/java/net/minecraft/server/Container.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java index 5b7058bf..734378bc 100644 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -119,12 +119,14 @@ public abstract class Container { } if (j == 1) { - // CraftBukkit start - if (playerinventory.getCarried().count > 0) { - entityhuman.drop(playerinventory.getCarried().a(1)); + // CraftBukkit start - Store a reference + ItemStack itemstack1 = playerinventory.getCarried(); + if (itemstack1.count > 0) { + entityhuman.drop(itemstack1.a(1)); } - // CraftBukkit end - if (playerinventory.getCarried().count == 0) { + + if (itemstack1.count == 0) { + // CraftBukkit end playerinventory.setCarried((ItemStack) null); } } -- cgit v1.2.3