mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-12 01:41:05 +01:00
59 lines
3.4 KiB
Diff
59 lines
3.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Sat, 16 Jan 2021 14:30:12 -0500
|
||
|
|
Subject: [PATCH] Make ProjectileHitEvent Cancellable
|
||
|
|
|
||
|
|
Allows cancelling things like detonating TNT from Fire Arrows
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
|
||
|
|
index 74ca38f8e4e1addc243c3f3b57021d26f0ce3c97..0840fdf3585407ec317f0326359619220c64db78 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityFireball.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityFireball.java
|
||
|
|
@@ -71,7 +71,7 @@ public abstract class EntityFireball extends IProjectile {
|
||
|
|
|
||
|
|
// CraftBukkit start - Fire ProjectileHitEvent
|
||
|
|
if (this.dead) {
|
||
|
|
- CraftEventFactory.callProjectileHitEvent(this, movingobjectposition);
|
||
|
|
+ if (!CraftEventFactory.callProjectileHitEvent(this, movingobjectposition)) return; // Paper - this is an undesired duplicate event, but make cancellable
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java
|
||
|
|
index 9f5ce64a60fe7c312399ee416b11b84213dd3bee..bbc089b41fcbe0141f13591db2cb44b9e688cac4 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/IProjectile.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/IProjectile.java
|
||
|
|
@@ -118,7 +118,7 @@ public abstract class IProjectile extends Entity {
|
||
|
|
}
|
||
|
|
|
||
|
|
protected void a(MovingObjectPosition movingobjectposition) {
|
||
|
|
- org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // CraftBukkit - Call event
|
||
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition)) return; // CraftBukkit - Call event // Paper - make cancellable
|
||
|
|
MovingObjectPosition.EnumMovingObjectType movingobjectposition_enummovingobjecttype = movingobjectposition.getType();
|
||
|
|
|
||
|
|
if (movingobjectposition_enummovingobjecttype == MovingObjectPosition.EnumMovingObjectType.ENTITY) {
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
index c762015e1402b59bf28dae7f947e7737fbac5c1d..63d329dca12f902e2fb2a62ee4c86aea6453f1a3 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
@@ -1295,9 +1295,9 @@ public class CraftEventFactory {
|
||
|
|
return event;
|
||
|
|
}
|
||
|
|
|
||
|
|
- public static void callProjectileHitEvent(Entity entity, MovingObjectPosition position) {
|
||
|
|
+ public static boolean callProjectileHitEvent(Entity entity, MovingObjectPosition position) { // Paper - make cancellable
|
||
|
|
if (position.getType() == MovingObjectPosition.EnumMovingObjectType.MISS) {
|
||
|
|
- return;
|
||
|
|
+ return false; // Paper - make cancellable
|
||
|
|
}
|
||
|
|
|
||
|
|
Block hitBlock = null;
|
||
|
|
@@ -1314,7 +1314,7 @@ public class CraftEventFactory {
|
||
|
|
}
|
||
|
|
|
||
|
|
ProjectileHitEvent event = new ProjectileHitEvent((Projectile) entity.getBukkitEntity(), hitEntity, hitBlock, hitFace);
|
||
|
|
- entity.world.getServer().getPluginManager().callEvent(event);
|
||
|
|
+ return event.callEvent(); // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
public static ExpBottleEvent callExpBottleEvent(Entity entity, int exp) {
|