mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 12:05:53 +01:00
e1c0033552
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: 2b4b6d14 PR-1023: Convert InventoryView to interface CraftBukkit Changes: 68603b1c1 Use expanded interaction ranges for traced interact events eae9f760c PR-1414: Convert InventoryView to interface ee9eafe67 Fix Implementation for DamageSource#isIndirect for internal custom causing entity
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
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 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.
|
|
*
|