another patch

patches/server/0143-Shoulder-Entities-Release-API.patch

@@ -1,96 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 17 Jun 2017 15:18:30 -0400
-Subject: [PATCH] Shoulder Entities Release API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 6da451d587c419ffead981876731b847ce3e81db..b7b4b4b3e3fbebd359f5ea199151a0d5978c47b3 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1949,20 +1949,44 @@ public abstract class Player extends LivingEntity {
- 
-     }
- 
-+    // Paper start
-+    public Entity releaseLeftShoulderEntity() {
-+        Entity entity = this.spawnEntityFromShoulder0(this.getShoulderEntityLeft());
-+        if (entity != null) {
-+            this.setShoulderEntityLeft(new CompoundTag());
-+        }
-+        return entity;
-+    }
-+
-+    public Entity releaseRightShoulderEntity() {
-+        Entity entity = this.spawnEntityFromShoulder0(this.getShoulderEntityRight());
-+        if (entity != null) {
-+            this.setShoulderEntityRight(new CompoundTag());
-+        }
-+        return entity;
-+    }
-+    // Paper - maintain old signature
-     private boolean spawnEntityFromShoulder(CompoundTag nbttagcompound) { // CraftBukkit void->boolean
--        if (!this.level.isClientSide && !nbttagcompound.isEmpty()) {
-+        return spawnEntityFromShoulder0(nbttagcompound) != null;
-+    }
-+
-+    // Paper - return entity
-+    private Entity spawnEntityFromShoulder0(@Nullable CompoundTag nbttagcompound) {
-+        if (!this.level.isClientSide && nbttagcompound != null && !nbttagcompound.isEmpty()) {
-             return EntityType.create(nbttagcompound, this.level).map((entity) -> { // CraftBukkit
-                 if (entity instanceof TamableAnimal) {
-                     ((TamableAnimal) entity).setOwnerUUID(this.uuid);
-                 }
- 
-                 entity.setPos(this.getX(), this.getY() + 0.699999988079071D, this.getZ());
--                return ((ServerLevel) this.level).addWithUUID(entity, CreatureSpawnEvent.SpawnReason.SHOULDER_ENTITY); // CraftBukkit
--            }).orElse(true); // CraftBukkit
-+                boolean addedToWorld = ((ServerLevel) this.level).addWithUUID(entity, CreatureSpawnEvent.SpawnReason.SHOULDER_ENTITY); // CraftBukkit
-+                return addedToWorld ? entity : null;
-+            }).orElse(null); // CraftBukkit // Paper - true -> 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 afb71ae8bd5f417f6cd99e26c3b45e5b544beb21..cc1caa32ea430f69d0dcfb76e1a08fb78650877d 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -500,6 +500,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
-         this.getHandle().getCooldowns().addCooldown(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 this.discoverRecipes(Arrays.asList(recipe)) != 0;