summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDoctorDark <doctordark11@gmail.com>2015-06-10 23:35:49 +0100
committermd_5 <git@md-5.net>2015-06-27 15:48:22 +1000
commitd432434fd84066363fb89d58b071a81d2c50cbc0 (patch)
tree19d9e9503467aef52c50bc07d8181f4f9212fc5f /src
parent76c834a8497c027419a0f7c9b271a6fc55fda18c (diff)
downloadcraftbukkit-d432434fd84066363fb89d58b071a81d2c50cbc0.tar
craftbukkit-d432434fd84066363fb89d58b071a81d2c50cbc0.tar.gz
craftbukkit-d432434fd84066363fb89d58b071a81d2c50cbc0.tar.lz
craftbukkit-d432434fd84066363fb89d58b071a81d2c50cbc0.tar.xz
craftbukkit-d432434fd84066363fb89d58b071a81d2c50cbc0.zip
SPIGOT-980: Fix NPE when setting items of offline players
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
index 8355f364..98213c7b 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
@@ -38,6 +38,7 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
public void setItem(int index, ItemStack item) {
super.setItem(index, item);
EntityPlayer player = ((CraftPlayer) this.getHolder()).getHandle();
+ if (player.playerConnection == null) return;
// PacketPlayOutSetSlot places the items differently than setItem()
//
// Between, and including, index 9 (the first index outside of the hotbar) and index 35 (the last index before