aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0465-Fix-DamageSource-API.patch
diff options
context:
space:
mode:
authormaxcom1 <[email protected]>2024-03-23 22:26:17 +0100
committerGitHub <[email protected]>2024-03-23 17:26:17 -0400
commitb6001403e9703cadaa6e8c8558e732b91c3c6d6e (patch)
treea8c57bbc334a8ad48d4ad2b43db335667b142bee /patches/api/0465-Fix-DamageSource-API.patch
parent9ec7dfcbc41c6e625de0050b6997160a75df9f44 (diff)
downloadPaper-b6001403e9703cadaa6e8c8558e732b91c3c6d6e.tar.gz
Paper-b6001403e9703cadaa6e8c8558e732b91c3c6d6e.zip
Add methods to change entity physics (#10334)
Diffstat (limited to 'patches/api/0465-Fix-DamageSource-API.patch')
-rw-r--r--patches/api/0465-Fix-DamageSource-API.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/api/0465-Fix-DamageSource-API.patch b/patches/api/0465-Fix-DamageSource-API.patch
new file mode 100644
index 0000000000..efe4403e2c
--- /dev/null
+++ b/patches/api/0465-Fix-DamageSource-API.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 16 Mar 2024 11:21:14 -0700
+Subject: [PATCH] Fix DamageSource API
+
+
+diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
+index 6b24d1281cb8f0253430c9c1a1323e2670bb9c93..8ea4be529400b34df3d31b0f17c2d145345523d9 100644
+--- a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
++++ b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
+@@ -60,6 +60,20 @@ public class EntityDamageByEntityEvent extends EntityDamageEvent {
+ }
+ // Paper end
+
++ // Paper start
++ /**
++ * {@inheritDoc}
++ * <p>
++ * The {@link DamageSource#getDirectEntity()} may be different from the {@link #getDamager()}
++ * if the Minecraft damage source did not originally include an damager entity, but one was included
++ * for this event {@link #getDamager()}.
++ */
++ @Override
++ public @NotNull DamageSource getDamageSource() {
++ return super.getDamageSource();
++ }
++ // Paper end
++
+ /**
+ * Returns the entity that damaged the defender.
+ *