aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0447-Fix-DamageSource-API.patch
blob: eec753daa546695304481a703ef5e7e327a76590 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
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 341f99550d077c60306e8a246a254b768ebbeb48..31a36ed3baf44c961173c6dd10d69055e3597897 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.
      *