From bb1beda67bfd94632815acc8ac5d68f5a8e3e410 Mon Sep 17 00:00:00 2001 From: Mart Date: Mon, 17 Mar 2025 05:54:49 -0400 Subject: [PATCH] feat: add event to wind charge explode (#12248) * feat: add event to wind charge explode * fix: use correct parameters * feat: allow setters to work * fix: use consts * Unify paper comments --------- Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com> --- .../windcharge/BreezeWindCharge.java.patch | 26 +++++++++++++++++++ .../windcharge/WindCharge.java.patch | 26 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 paper-server/patches/sources/net/minecraft/world/entity/projectile/windcharge/BreezeWindCharge.java.patch create mode 100644 paper-server/patches/sources/net/minecraft/world/entity/projectile/windcharge/WindCharge.java.patch diff --git a/paper-server/patches/sources/net/minecraft/world/entity/projectile/windcharge/BreezeWindCharge.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/projectile/windcharge/BreezeWindCharge.java.patch new file mode 100644 index 000000000..4ea64e3a3 --- /dev/null +++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/windcharge/BreezeWindCharge.java.patch @@ -0,0 +1,26 @@ +--- a/net/minecraft/world/entity/projectile/windcharge/BreezeWindCharge.java ++++ b/net/minecraft/world/entity/projectile/windcharge/BreezeWindCharge.java +@@ -20,6 +_,12 @@ + + @Override + public void explode(Vec3 pos) { ++ // Paper start - Fire event for WindCharge explosions ++ org.bukkit.event.entity.ExplosionPrimeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExplosionPrimeEvent(this, RADIUS, false); ++ if (event.isCancelled()) { ++ return; ++ } ++ // Paper end - Fire event for WindCharge explosions + this.level() + .explode( + this, +@@ -28,8 +_,8 @@ + pos.x(), + pos.y(), + pos.z(), +- 3.0F, +- false, ++ event.getRadius(), // Paper - Fire event for WindCharge explosions ++ event.getFire(), // Paper - Fire event for WindCharge explosions + Level.ExplosionInteraction.TRIGGER, + ParticleTypes.GUST_EMITTER_SMALL, + ParticleTypes.GUST_EMITTER_LARGE, diff --git a/paper-server/patches/sources/net/minecraft/world/entity/projectile/windcharge/WindCharge.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/projectile/windcharge/WindCharge.java.patch new file mode 100644 index 000000000..f01f24a98 --- /dev/null +++ b/paper-server/patches/sources/net/minecraft/world/entity/projectile/windcharge/WindCharge.java.patch @@ -0,0 +1,26 @@ +--- a/net/minecraft/world/entity/projectile/windcharge/WindCharge.java ++++ b/net/minecraft/world/entity/projectile/windcharge/WindCharge.java +@@ -52,6 +_,12 @@ + + @Override + public void explode(Vec3 pos) { ++ // Paper start - Fire event for WindCharge explosions ++ org.bukkit.event.entity.ExplosionPrimeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExplosionPrimeEvent(this, RADIUS, false); ++ if (event.isCancelled()) { ++ return; ++ } ++ // Paper end - Fire event for WindCharge explosions + this.level() + .explode( + this, +@@ -60,8 +_,8 @@ + pos.x(), + pos.y(), + pos.z(), +- 1.2F, +- false, ++ event.getRadius(), // Paper - Fire event for WindCharge explosions ++ event.getFire(), // Paper - Fire event for WindCharge explosions + Level.ExplosionInteraction.TRIGGER, + ParticleTypes.GUST_EMITTER_SMALL, + ParticleTypes.GUST_EMITTER_LARGE,