Paper/patches/server/0142-Shoulder-Entities-Release-API.patch

98 lines
4.1 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
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
2023-09-21 22:35:39 +02:00
index a2f6e3f381bf251d93a63aff9f9af307350ffc50..3d333332ae02951af087cd37cbe7f1ecf8b0c932 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
2023-09-21 22:35:39 +02:00
@@ -2042,20 +2042,45 @@ public abstract class Player extends LivingEntity {
2021-06-11 14:02:28 +02:00
}
+ // Paper start
+ public Entity releaseLeftShoulderEntity() {
2023-06-07 22:19:14 +02:00
+ Entity entity = this.respawnEntityOnShoulder0(this.getShoulderEntityLeft());
2021-06-11 14:02:28 +02:00
+ if (entity != null) {
+ this.setShoulderEntityLeft(new CompoundTag());
+ }
+ return entity;
+ }
+
+ public Entity releaseRightShoulderEntity() {
2023-06-07 22:19:14 +02:00
+ Entity entity = this.respawnEntityOnShoulder0(this.getShoulderEntityRight());
2021-06-11 14:02:28 +02:00
+ if (entity != null) {
+ this.setShoulderEntityRight(new CompoundTag());
+ }
+ return entity;
+ }
+ // Paper - maintain old signature
2023-06-07 21:37:42 +02:00
+
private boolean respawnEntityOnShoulder(CompoundTag nbttagcompound) { // CraftBukkit void->boolean
- if (!this.level().isClientSide && !nbttagcompound.isEmpty()) {
2023-06-07 22:19:14 +02:00
+ return this.respawnEntityOnShoulder0(nbttagcompound) != null;
2021-06-11 14:02:28 +02:00
+ }
+
+ // Paper - return entity
2023-06-07 21:37:42 +02:00
+ private Entity respawnEntityOnShoulder0(CompoundTag nbttagcompound) { // CraftBukkit void->boolean
+ if (!this.level().isClientSide && nbttagcompound != null && !nbttagcompound.isEmpty()) {
return EntityType.create(nbttagcompound, this.level()).map((entity) -> { // CraftBukkit
2021-06-11 14:02:28 +02:00
if (entity instanceof TamableAnimal) {
((TamableAnimal) entity).setOwnerUUID(this.uuid);
}
entity.setPos(this.getX(), this.getY() + 0.699999988079071D, this.getZ());
2023-06-07 21:37:42 +02:00
- return ((ServerLevel) this.level()).addWithUUID(entity, CreatureSpawnEvent.SpawnReason.SHOULDER_ENTITY); // CraftBukkit
2021-06-11 14:02:28 +02:00
- }).orElse(true); // CraftBukkit
2023-06-07 21:37:42 +02:00
+ boolean addedToWorld = ((ServerLevel) this.level()).addWithUUID(entity, CreatureSpawnEvent.SpawnReason.SHOULDER_ENTITY); // CraftBukkit
2021-06-11 14:02:28 +02:00
+ return addedToWorld ? entity : null;
2021-11-23 15:03:50 +01:00
+ }).orElse(null); // CraftBukkit // Paper - true -> null
2021-06-11 14:02:28 +02:00
}
- 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
2023-09-21 22:35:39 +02:00
index b9578f7d0f61d15bee1f99181bf932cdbb0e611c..c40b3b8ff02c0e21fab53f6749f9c72b7e3c48a1 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -516,6 +516,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
2021-06-12 13:18:01 +02:00
this.getHandle().getCooldowns().addCooldown(CraftMagicNumbers.getItem(material), ticks);
2021-06-11 14:02:28 +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
public boolean discoverRecipe(NamespacedKey recipe) {
2021-06-12 13:18:01 +02:00
return this.discoverRecipes(Arrays.asList(recipe)) != 0;