From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic 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} + *

+ * 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. *