From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Wed, 11 Jan 2023 20:59:01 +0200 Subject: [PATCH] Expand Pose API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index 3aeb24963ce0415e97168196cbf53e8f26334013..de841b91b0a0c10c4b9f4dfdd3858c83f81ad183 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -420,6 +420,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @javax.annotation.Nullable private UUID originWorld; public boolean freezeLocked = false; // Paper - Freeze Tick Lock API + public boolean fixedPose = false; // Paper - Expand Pose API public void setOrigin(@javax.annotation.Nonnull Location location) { this.origin = location.toVector(); @@ -643,6 +644,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess public void onClientRemoval() {} public void setPose(net.minecraft.world.entity.Pose pose) { + if (this.fixedPose) return; // Paper - Expand Pose API // CraftBukkit start if (pose == this.getPose()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 96448895a0a18e6f819d0a2a629c04abd331fa85..d52b7c5739b8ea51cb91c45ddcad6237b9ce5a5e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -897,6 +897,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public boolean isSneaking() { return this.getHandle().isShiftKeyDown(); } + + @Override + public void setPose(Pose pose, boolean fixed) { + Preconditions.checkNotNull(pose, "Pose cannot be null"); + final Entity handle = this.getHandle(); + handle.fixedPose = false; + handle.setPose(net.minecraft.world.entity.Pose.values()[pose.ordinal()]); + handle.fixedPose = fixed; + } + + @Override + public boolean hasFixedPose() { + return this.getHandle().fixedPose; + } // Paper end @Override