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 cc4906ed08e84beaca0ba93200693a0a3730fb4c..67dda7d37cc4af2f09734da5653e8fa33098c7db 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -427,6 +427,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(); @@ -625,6 +626,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess public void onRemoval(Entity.RemovalReason reason) {} 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 dd84f7d6874a799aa09349fe0a1bd6ebb4cea2dd..11a08ff211a9a32a825519ddb1736e02cf7f685e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -900,6 +900,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