2021-06-14 20:50:22 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
|
|
|
Date: Sun, 13 Dec 2020 05:32:05 +0200
|
|
|
|
Subject: [PATCH] Expose LivingEntity hurt direction
|
|
|
|
|
|
|
|
|
2023-03-14 23:13:41 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
2023-05-12 13:10:08 +02:00
|
|
|
index 1ada0736ce35c0299e40d4ce8fbe49f170ea0c6f..70ce47777793d416d5f0bbcbf087e2f0a28a7740 100644
|
2023-03-14 23:13:41 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
|
|
@@ -181,7 +181,7 @@ public abstract class Player extends LivingEntity {
|
|
|
|
private Optional<GlobalPos> lastDeathLocation;
|
|
|
|
@Nullable
|
|
|
|
public FishingHook fishing;
|
|
|
|
- protected float hurtDir;
|
|
|
|
+ public float hurtDir; // Paper - protected -> public
|
|
|
|
// Paper start
|
|
|
|
public boolean affectsSpawning = true;
|
|
|
|
// Paper end
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
2023-05-12 13:10:08 +02:00
|
|
|
index 581d99e0dbf4b1a59389645f01f33aed7a340686..ffd07d9751deb87902213a3349bcb398ee281640 100644
|
2023-03-14 23:13:41 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
2023-05-12 13:10:08 +02:00
|
|
|
@@ -126,6 +126,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
2023-03-14 23:13:41 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public void setHurtDirection(float hurtDirection) {
|
|
|
|
+ this.getHandle().hurtDir = hurtDirection;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public int getSleepTicks() {
|
|
|
|
return this.getHandle().sleepCounter;
|
2021-06-14 20:50:22 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
2023-03-14 23:13:41 +01:00
|
|
|
index a95825e88ba31c255292451532d18a23c8d502cb..7204d2b542d8454fe12cce1ff049363045d4f5e5 100644
|
2021-06-14 20:50:22 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
2023-02-07 16:43:20 +01:00
|
|
|
@@ -913,5 +913,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
2021-06-14 20:50:22 +02:00
|
|
|
public void playPickupItemAnimation(org.bukkit.entity.Item item, int quantity) {
|
|
|
|
getHandle().take(((CraftItem) item).getHandle(), quantity);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public float getHurtDirection() {
|
2023-03-14 23:13:41 +01:00
|
|
|
+ return this.getHandle().getHurtDir();
|
2021-06-14 20:50:22 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setHurtDirection(float hurtDirection) {
|
2023-03-14 23:13:41 +01:00
|
|
|
+ throw new UnsupportedOperationException("Cannot set the hurt direction on a non player");
|
2021-06-14 20:50:22 +02:00
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|