52 lines
2.3 KiB
Diff
52 lines
2.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: SoSeDiK <mrsosedik@gmail.com>
|
||
|
|
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 0ed297f189e5d21c497ac78294db6ca664c0f2c4..e8485fb900b25e911a858678a833852731cb2ace 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -417,6 +417,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();
|
||
|
|
@@ -701,6 +702,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 7e132298252d196a97c99b45e58a3ac9a1de7216..2dbe8b870fd39b4d22e9725912f443757ae70761 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||
|
|
@@ -1227,6 +1227,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
|