diff options
| author | Shane Freeder <[email protected]> | 2024-05-09 14:51:33 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2024-05-09 14:51:33 +0100 |
| commit | 3693bbdc6b65e68db10375d3eeab70f06708b729 (patch) | |
| tree | 4a71a5e6e5f50b3e2937053a5d4b4196ef67665b /patches/api/0461-Fix-DamageSource-API.patch | |
| parent | f2512b12385961f8ca1f69efebe5ed0e00c0caa8 (diff) | |
| download | Paper-timings/use-internals.tar.gz Paper-timings/use-internals.zip | |
Use internals for getting block/entity countstimings/use-internals
For a long time I've been meaning to move some of this logic internally
as this would allow us to avoid hitting systems like block state snapshots
which can create issues as many of the spigot implementations of this
stuff are increasingly broken, leading to unexpected crashes during ticking,
even if the API cannot properly interact with these such states/items,
it's generally more preferable to not crash the server in the course,
and just let those interactions fail more gracefully.
Diffstat (limited to 'patches/api/0461-Fix-DamageSource-API.patch')
| -rw-r--r-- | patches/api/0461-Fix-DamageSource-API.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/api/0461-Fix-DamageSource-API.patch b/patches/api/0461-Fix-DamageSource-API.patch new file mode 100644 index 0000000000..efe4403e2c --- /dev/null +++ b/patches/api/0461-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. + * |