diff options
| author | Nassim Jahnke <[email protected]> | 2024-06-15 18:52:19 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-06-15 18:52:19 +0200 |
| commit | a835ad1076a4fccbc168554b9bf20e7c0fead761 (patch) | |
| tree | 0241630113c713edcd8b0d8ec6f16f5864c5fe90 | |
| parent | b4200387992e94d23766a061b999083946dec7b0 (diff) | |
| parent | 0b6701da5a81b06014993c15aa1bb48bb73774d4 (diff) | |
| download | Paper-a835ad1076a4fccbc168554b9bf20e7c0fead761.tar.gz Paper-a835ad1076a4fccbc168554b9bf20e7c0fead761.zip | |
Merge remote-tracking branch 'origin/dev/1.21' into dev/1.21
| -rw-r--r-- | patches/server/0951-Fix-DamageSource-API.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0951-Fix-DamageSource-API.patch b/patches/server/0951-Fix-DamageSource-API.patch index a9af537493..b6a6d334d0 100644 --- a/patches/server/0951-Fix-DamageSource-API.patch +++ b/patches/server/0951-Fix-DamageSource-API.patch @@ -175,7 +175,7 @@ index 60eac9df10a9a395a1568925515d010eb51a64e5..55fd997a4e894eeab24de269d59e4861 if (flag && entity instanceof LivingEntity entityliving) { diff --git a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java b/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java -index 5572c50cac4968e3ec75fe1fc98442407bc3b905..3c5e937ade4bbf6a2f5f123ce53001eb915d51eb 100644 +index 5572c50cac4968e3ec75fe1fc98442407bc3b905..7df86e7124a9ed359f05324b8fc4c8862f7e4b79 100644 --- a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java +++ b/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java @@ -41,13 +41,13 @@ public class CraftDamageSource implements DamageSource { @@ -183,7 +183,7 @@ index 5572c50cac4968e3ec75fe1fc98442407bc3b905..3c5e937ade4bbf6a2f5f123ce53001eb @Override public org.bukkit.entity.Entity getCausingEntity() { - net.minecraft.world.entity.Entity entity = this.getHandle().getCausingDamager(); -+ net.minecraft.world.entity.Entity entity = this.getHandle().getCustomEventDamager(); // Paper ++ net.minecraft.world.entity.Entity entity = this.getHandle().getEntity(); // Paper - fix DamageSource API - revert to vanilla return (entity != null) ? entity.getBukkitEntity() : null; } |