diff options
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java index 6422c4ad..25e1e5a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -443,7 +443,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @Override public org.bukkit.entity.Entity getShoulderEntityLeft() { - if (getHandle().getShoulderEntityLeft() != null) { + if (!getHandle().getShoulderEntityLeft().isEmpty()) { Entity shoulder = EntityTypes.a(getHandle().getShoulderEntityLeft(), getHandle().world); return (shoulder == null) ? null : shoulder.getBukkitEntity(); @@ -454,7 +454,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @Override public void setShoulderEntityLeft(org.bukkit.entity.Entity entity) { - getHandle().setShoulderEntityLeft(entity == null ? null : ((CraftEntity) entity).save()); + getHandle().setShoulderEntityLeft(entity == null ? new NBTTagCompound() : ((CraftEntity) entity).save()); if (entity != null) { entity.remove(); } @@ -462,7 +462,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @Override public org.bukkit.entity.Entity getShoulderEntityRight() { - if (getHandle().getShoulderEntityRight() != null) { + if (!getHandle().getShoulderEntityRight().isEmpty()) { Entity shoulder = EntityTypes.a(getHandle().getShoulderEntityRight(), getHandle().world); return (shoulder == null) ? null : shoulder.getBukkitEntity(); @@ -473,7 +473,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @Override public void setShoulderEntityRight(org.bukkit.entity.Entity entity) { - getHandle().setShoulderEntityRight(entity == null ? null : ((CraftEntity) entity).save()); + getHandle().setShoulderEntityRight(entity == null ? new NBTTagCompound() : ((CraftEntity) entity).save()); if (entity != null) { entity.remove(); } |