SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, #1008: Add EntityRemoveEvent

By: DerFrZocker <derrieple@gmail.com>
2024-02-21 20:55:34 +11:00
parent 6dc11b5d28
commit 64cd2b148a
81 changed files with 2037 additions and 475 deletions
--- a/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityEvokerFangs.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityEvokerFangs.patch
@@ -1,6 +1,26 @@
 --- a/net/minecraft/world/entity/projectile/EntityEvokerFangs.java
 +++ b/net/minecraft/world/entity/projectile/EntityEvokerFangs.java
-@@ -129,7 +129,7 @@
+@@ -14,6 +14,10 @@
+ import net.minecraft.world.entity.TraceableEntity;
+ import net.minecraft.world.level.World;
+ 
+// CraftBukkit start
+import org.bukkit.event.entity.EntityRemoveEvent;
+// CraftBukkit end
+
+ public class EntityEvokerFangs extends Entity implements TraceableEntity {
+ 
+     public static final int ATTACK_DURATION = 20;
+@@ -118,7 +122,7 @@
+             }
+ 
+             if (--this.lifeTicks < 0) {
+-                this.discard();
+                this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+             }
+         }
+ 
+@@ -129,7 +133,7 @@
 
         if (entityliving.isAlive() && !entityliving.isInvulnerable() && entityliving != entityliving1) {
             if (entityliving1 == null) {