Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-3248: Don't set shoulder compounds of EntityHuman to null

Browse Source
This commit is contained in:
BlackHole 2017-05-17 20:26:51 +02:00 committed by md_5
parent 45102fcf28
commit 3ecbb59cbb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View File

@ -443,7 +443,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@Override @Override
public org.bukkit.entity.Entity getShoulderEntityLeft() { public org.bukkit.entity.Entity getShoulderEntityLeft() {
if (getHandle().getShoulderEntityLeft() != null) { if (!getHandle().getShoulderEntityLeft().isEmpty()) {
Entity shoulder = EntityTypes.a(getHandle().getShoulderEntityLeft(), getHandle().world); Entity shoulder = EntityTypes.a(getHandle().getShoulderEntityLeft(), getHandle().world);
return (shoulder == null) ? null : shoulder.getBukkitEntity(); return (shoulder == null) ? null : shoulder.getBukkitEntity();
@ -454,7 +454,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@Override @Override
public void setShoulderEntityLeft(org.bukkit.entity.Entity entity) { 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) { if (entity != null) {
entity.remove(); entity.remove();
} }
@ -462,7 +462,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@Override @Override
public org.bukkit.entity.Entity getShoulderEntityRight() { public org.bukkit.entity.Entity getShoulderEntityRight() {
if (getHandle().getShoulderEntityRight() != null) { if (!getHandle().getShoulderEntityRight().isEmpty()) {
Entity shoulder = EntityTypes.a(getHandle().getShoulderEntityRight(), getHandle().world); Entity shoulder = EntityTypes.a(getHandle().getShoulderEntityRight(), getHandle().world);
return (shoulder == null) ? null : shoulder.getBukkitEntity(); return (shoulder == null) ? null : shoulder.getBukkitEntity();
@ -473,7 +473,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@Override @Override
public void setShoulderEntityRight(org.bukkit.entity.Entity entity) { 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) { if (entity != null) {
entity.remove(); entity.remove();
} }