From ee388b6d2cceddbde1571cb932310c77d9c6b7af Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 15:18:30 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index c7bb6cbcb..92569f934 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1800,20 +1800,44 @@ public abstract class EntityHuman extends EntityLiving { } + // Paper start + public Entity releaseLeftShoulderEntity() { + Entity entity = this.spawnEntityFromShoulder0(this.getShoulderEntityLeft()); + if (entity != null) { + this.setShoulderEntityLeft(new NBTTagCompound()); + } + return entity; + } + + public Entity releaseRightShoulderEntity() { + Entity entity = this.spawnEntityFromShoulder0(this.getShoulderEntityRight()); + if (entity != null) { + this.setShoulderEntityRight(new NBTTagCompound()); + } + return entity; + } + // Paper - maintain old signature private boolean spawnEntityFromShoulder(NBTTagCompound nbttagcompound) { // CraftBukkit void->boolean - if (!this.world.isClientSide && !nbttagcompound.isEmpty()) { + return spawnEntityFromShoulder0(nbttagcompound) != null; + } + + // Paper - return entity + private Entity spawnEntityFromShoulder0(@Nullable NBTTagCompound nbttagcompound) { + if (!this.world.isClientSide && nbttagcompound != null && !nbttagcompound.isEmpty()) { return EntityTypes.a(nbttagcompound, this.world).map((entity) -> { // CraftBukkit if (entity instanceof EntityTameableAnimal) { ((EntityTameableAnimal) entity).setOwnerUUID(this.uniqueID); } entity.setPosition(this.locX, this.locY + 0.699999988079071D, this.locZ); - return ((WorldServer) this.world).addEntitySerialized(entity, CreatureSpawnEvent.SpawnReason.SHOULDER_ENTITY); // CraftBukkit - }).orElse(true); // CraftBukkit + boolean addedToWorld = ((WorldServer) this.world).addEntitySerialized(entity, CreatureSpawnEvent.SpawnReason.SHOULDER_ENTITY); // CraftBukkit + return addedToWorld ? entity : null; + }).orElse(null); // CraftBukkit // Paper - false -> null } - return true; // CraftBukkit + return null; // Paper - return null } + // Paper end @Override public abstract boolean isSpectator(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java index 027063239..37b057c51 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -665,6 +665,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { getHandle().getCooldownTracker().setCooldown(CraftMagicNumbers.getItem(material), ticks); } + // Paper start + @Override + public org.bukkit.entity.Entity releaseLeftShoulderEntity() { + if (!getHandle().getShoulderEntityLeft().isEmpty()) { + Entity entity = getHandle().releaseLeftShoulderEntity(); + if (entity != null) { + return entity.getBukkitEntity(); + } + } + + return null; + } + + @Override + public org.bukkit.entity.Entity releaseRightShoulderEntity() { + if (!getHandle().getShoulderEntityRight().isEmpty()) { + Entity entity = getHandle().releaseRightShoulderEntity(); + if (entity != null) { + return entity.getBukkitEntity(); + } + } + + return null; + } + // Paper end + @Override public boolean discoverRecipe(NamespacedKey recipe) { return discoverRecipes(Arrays.asList(recipe)) != 0; -- 2.22.0