2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2017-06-17 21:20:25 +02:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sat, 17 Jun 2017 15:18:30 -0400
|
|
|
|
Subject: [PATCH] Shoulder Entities Release API
|
|
|
|
|
|
|
|
|
2021-03-16 08:19:45 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
|
|
|
|
index 1a62ea103bb827ffcf0b3fd18a26ac72c0a5ba5c..2afd8ccb03ebae94d99995d383f55744bd58df0a 100644
|
|
|
|
--- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
|
|
|
|
@@ -1878,20 +1878,44 @@ public abstract class EntityHuman extends EntityLiving {
|
2019-07-20 06:01:24 +02:00
|
|
|
|
2017-06-17 21:20:25 +02:00
|
|
|
}
|
2019-04-28 01:23:53 +02:00
|
|
|
|
2017-06-17 21:20:25 +02:00
|
|
|
+ // Paper start
|
|
|
|
+ public Entity releaseLeftShoulderEntity() {
|
|
|
|
+ Entity entity = this.spawnEntityFromShoulder0(this.getShoulderEntityLeft());
|
|
|
|
+ if (entity != null) {
|
|
|
|
+ this.setShoulderEntityLeft(new NBTTagCompound());
|
|
|
|
+ }
|
|
|
|
+ return entity;
|
|
|
|
+ }
|
2019-04-28 01:23:53 +02:00
|
|
|
+
|
2017-06-17 21:20:25 +02:00
|
|
|
+ public Entity releaseRightShoulderEntity() {
|
|
|
|
+ Entity entity = this.spawnEntityFromShoulder0(this.getShoulderEntityRight());
|
|
|
|
+ if (entity != null) {
|
|
|
|
+ this.setShoulderEntityRight(new NBTTagCompound());
|
|
|
|
+ }
|
|
|
|
+ return entity;
|
|
|
|
+ }
|
2019-04-28 01:23:53 +02:00
|
|
|
+ // Paper - maintain old signature
|
2019-07-20 06:01:24 +02:00
|
|
|
private boolean spawnEntityFromShoulder(NBTTagCompound nbttagcompound) { // CraftBukkit void->boolean
|
2019-04-28 01:23:53 +02:00
|
|
|
- if (!this.world.isClientSide && !nbttagcompound.isEmpty()) {
|
2017-06-17 21:20:25 +02:00
|
|
|
+ return spawnEntityFromShoulder0(nbttagcompound) != null;
|
|
|
|
+ }
|
2019-04-28 01:23:53 +02:00
|
|
|
+
|
|
|
|
+ // 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);
|
|
|
|
}
|
2017-06-17 21:20:25 +02:00
|
|
|
|
2019-12-12 00:43:22 +01:00
|
|
|
entity.setPosition(this.locX(), this.locY() + 0.699999988079071D, this.locZ());
|
2019-04-28 01:23:53 +02:00
|
|
|
- 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
|
2017-06-17 21:20:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
- return true; // CraftBukkit
|
2019-04-28 01:23:53 +02:00
|
|
|
+ return null; // Paper - return null
|
2017-06-17 21:20:25 +02:00
|
|
|
}
|
|
|
|
+ // Paper end
|
|
|
|
|
2019-06-03 05:26:25 +02:00
|
|
|
@Override
|
2017-06-17 21:20:25 +02:00
|
|
|
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
|
2021-03-16 08:19:45 +01:00
|
|
|
index 105d0388998d1e35e634d2163fe1a44aa7037ac8..8661f97ac885daca068057c1fcc4eed54c6d7f14 100644
|
2017-06-17 21:20:25 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
2021-02-21 21:55:01 +01:00
|
|
|
@@ -493,6 +493,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
2019-07-28 16:32:14 +02:00
|
|
|
getHandle().getCooldownTracker().setCooldown(CraftMagicNumbers.getItem(material), ticks);
|
2017-06-17 21:20:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // 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
|
2018-10-02 12:01:56 +02:00
|
|
|
public boolean discoverRecipe(NamespacedKey recipe) {
|
|
|
|
return discoverRecipes(Arrays.asList(recipe)) != 0;
|