mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 12:11:47 +01:00
f6969b6374
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09b1c123 PR-916: Add more lightning API c085f3de PR-859: Add Entity#getTrackedBy CraftBukkit Changes: 1bf30a4e9 SPIGOT-7495: Spawning bee entity in asynchronous BlockPopulator causes IllegalStateException - Accessing LegacyRandomSource from multiple threads 476c5bccd PR-1267: Add more lightning API 40d5e6c02 PR-1190: Add Entity#getTrackedBy 40d41acc1 SPIGOT-7491: Downgrade bundled SQLite to be updated next release 44b31da38 PR-1264: Load Bukkit class before creating Registry item dc45a6738 SPIGOT-7496: Failure to load datapacks with multiple identical predicates f508657d6 Fix decompile error affecting javac ef7a4743d PR-1265: Ensure UTF-8 used in new test resource Spigot Changes: 224dad51 Rebuild patches
63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: TheTuso <piotrekpasztor@gmail.com>
|
|
Date: Thu, 2 Feb 2023 16:40:41 +0100
|
|
Subject: [PATCH] Add Entity Body Yaw API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
index 35ce9507933487935da8ae8eff4e94925b1abf76..5cf469a1bba2b09dcd28cf6bc506e8b7a8e2162f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -1446,6 +1446,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
|
public boolean isInPowderedSnow() {
|
|
return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public double getX() {
|
|
+ return this.entity.getX();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public double getY() {
|
|
+ return this.entity.getY();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public double getZ() {
|
|
+ return this.entity.getZ();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public float getPitch() {
|
|
+ return this.entity.getXRot();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public float getYaw() {
|
|
+ return this.entity.getBukkitYaw();
|
|
+ }
|
|
// Paper end
|
|
// Paper Start - Collision API
|
|
@Override
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index b4b56bebf5308f4dcc51c1a2815f9689a6918b13..e997aebe36436570e2461a4685f0fb371ce4ce14 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -1056,6 +1056,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
this.damageItemStack0(this.getHandle().getItemBySlot(nmsSlot), amount, nmsSlot);
|
|
}
|
|
|
|
+ @Override
|
|
+ public float getBodyYaw() {
|
|
+ return this.getHandle().getVisualRotationYInDegrees();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setBodyYaw(float bodyYaw) {
|
|
+ this.getHandle().setYBodyRot(bodyYaw);
|
|
+ }
|
|
+
|
|
private void damageItemStack0(net.minecraft.world.item.ItemStack nmsStack, int amount, net.minecraft.world.entity.EquipmentSlot slot) {
|
|
nmsStack.hurtAndBreak(amount, this.getHandle(), livingEntity -> {
|
|
if (slot != null) {
|