mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 21:17:00 +01:00
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Trevor Bedson <78997566+Prorickey@users.noreply.github.com>
|
||
|
|
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 92666c48620078623a451fbf68f673cb9f81c4b5..a24ae93efcdb2da5782d342c7697a1bb253400c7 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
|
||
|
|
@@ -651,6 +651,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) {
|