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 426023af3cbed9c17048e669c87a1c66bda4ad1b..f20ae9153b7098980ce6c0e75fcbbb4da652661b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -416,6 +416,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { private UUID originWorld; public boolean freezeLocked = false; // Paper - Freeze Tick Lock API public boolean collidingWithWorldBorder; // Paper + public boolean fixedPose = false; // Paper public void setOrigin(@javax.annotation.Nonnull Location location) { this.origin = location.toVector(); @@ -668,6 +669,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void onClientRemoval() {} public void setPose(net.minecraft.world.entity.Pose pose) { + if (this.fixedPose) return; // Paper // 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 c83d0461ef14ef0df8428387d0d8eac5ad010054..315d8260e196709ed9084272aa640f11e327c0a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1243,6 +1243,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