diff options
| author | booky10 <[email protected]> | 2023-11-04 20:20:01 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-11-04 20:20:01 +0100 |
| commit | f78d7ce8ffb7e4b6fd5ee256f5e3678ea04fd807 (patch) | |
| tree | 8e7abee5129e15a919630824c4f194a2811f7242 /patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch | |
| parent | 44057da46727138e19d951b56e98ad8c25c1f869 (diff) | |
| download | Paper-f78d7ce8ffb7e4b6fd5ee256f5e3678ea04fd807.tar.gz Paper-f78d7ce8ffb7e4b6fd5ee256f5e3678ea04fd807.zip | |
Remove "fix-curing-zombie-villager-discount" exploit option (#9895)
Diffstat (limited to 'patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch')
| -rw-r--r-- | patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch new file mode 100644 index 0000000000..3c23429d1c --- /dev/null +++ b/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Trevor Bedson <[email protected]> +Date: Fri, 14 Jul 2023 20:47:02 -0400 +Subject: [PATCH] Fire entity death event for ender dragon + + +diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +index 0edf0374c6890b2afdefc4b723f1f4501f4e7810..a288180da1996103eb7dc3bb87b4615f86630bb8 100644 +--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java ++++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +@@ -642,6 +642,15 @@ public class EnderDragon extends Mob implements Enemy { + + @Override + public void kill() { ++ // Paper start ++ this.silentDeath = true; ++ org.bukkit.event.entity.EntityDeathEvent deathEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this); ++ if (deathEvent.isCancelled()) { ++ this.silentDeath = false; // Reset to default if event was cancelled ++ return; ++ } ++ // Paper end ++ + this.remove(Entity.RemovalReason.KILLED); + this.gameEvent(GameEvent.ENTITY_DIE); + if (this.dragonFight != null) { |