2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Techcable <Techcable@outlook.com>
|
|
|
|
Date: Fri, 16 Dec 2016 21:25:39 -0600
|
|
|
|
Subject: [PATCH] Add ProjectileCollideEvent
|
|
|
|
|
2022-12-23 06:20:44 +01:00
|
|
|
Deprecated now and replaced with ProjectileHitEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
2024-07-18 10:13:20 +02:00
|
|
|
index 6ffc5b9eb2fa084c7cf397d944e6fc1d8d770dbb..50a4e657508e21717a61900660d85203d9373e19 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
2024-07-18 10:13:20 +02:00
|
|
|
@@ -1308,6 +1308,17 @@ public class CraftEventFactory {
|
2021-06-11 14:02:28 +02:00
|
|
|
return CraftItemStack.asNMSCopy(bitem);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
2022-12-23 06:20:44 +01:00
|
|
|
+ @Deprecated
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public static com.destroystokyo.paper.event.entity.ProjectileCollideEvent callProjectileCollideEvent(Entity entity, EntityHitResult position) {
|
|
|
|
+ Projectile projectile = (Projectile) entity.getBukkitEntity();
|
|
|
|
+ org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
|
|
|
|
+ com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
|
|
|
|
+ Bukkit.getPluginManager().callEvent(event);
|
|
|
|
+ return event;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
public static ProjectileLaunchEvent callProjectileLaunchEvent(Entity entity) {
|
|
|
|
Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
|
|
|
|
ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
|
2024-07-18 10:13:20 +02:00
|
|
|
@@ -1332,8 +1343,15 @@ public class CraftEventFactory {
|
2022-12-23 06:20:44 +01:00
|
|
|
if (position.getType() == HitResult.Type.ENTITY) {
|
|
|
|
hitEntity = ((EntityHitResult) position).getEntity().getBukkitEntity();
|
|
|
|
}
|
|
|
|
+ // Paper start - legacy event
|
|
|
|
+ boolean cancelled = false;
|
|
|
|
+ if (hitEntity != null && position instanceof EntityHitResult entityHitResult) {
|
|
|
|
+ cancelled = callProjectileCollideEvent(entity, entityHitResult).isCancelled();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
ProjectileHitEvent event = new ProjectileHitEvent((Projectile) entity.getBukkitEntity(), hitEntity, hitBlock, hitFace);
|
|
|
|
+ event.setCancelled(cancelled); // Paper - propagate legacy event cancellation to modern event
|
2023-06-07 21:19:26 +02:00
|
|
|
entity.level().getCraftServer().getPluginManager().callEvent(event);
|
2022-12-23 06:20:44 +01:00
|
|
|
return event;
|
|
|
|
}
|