Skip to content

Commit bb1beda

Browse files
mja00Warriorrrr
andauthored
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 <[email protected]>
1 parent aaaeb4e commit bb1beda

File tree

2 files changed

+52
-0
lines changed

2 files changed

+52
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
--- a/net/minecraft/world/entity/projectile/windcharge/BreezeWindCharge.java
2+
+++ b/net/minecraft/world/entity/projectile/windcharge/BreezeWindCharge.java
3+
@@ -20,6 +_,12 @@
4+
5+
@Override
6+
public void explode(Vec3 pos) {
7+
+ // Paper start - Fire event for WindCharge explosions
8+
+ org.bukkit.event.entity.ExplosionPrimeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExplosionPrimeEvent(this, RADIUS, false);
9+
+ if (event.isCancelled()) {
10+
+ return;
11+
+ }
12+
+ // Paper end - Fire event for WindCharge explosions
13+
this.level()
14+
.explode(
15+
this,
16+
@@ -28,8 +_,8 @@
17+
pos.x(),
18+
pos.y(),
19+
pos.z(),
20+
- 3.0F,
21+
- false,
22+
+ event.getRadius(), // Paper - Fire event for WindCharge explosions
23+
+ event.getFire(), // Paper - Fire event for WindCharge explosions
24+
Level.ExplosionInteraction.TRIGGER,
25+
ParticleTypes.GUST_EMITTER_SMALL,
26+
ParticleTypes.GUST_EMITTER_LARGE,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
--- a/net/minecraft/world/entity/projectile/windcharge/WindCharge.java
2+
+++ b/net/minecraft/world/entity/projectile/windcharge/WindCharge.java
3+
@@ -52,6 +_,12 @@
4+
5+
@Override
6+
public void explode(Vec3 pos) {
7+
+ // Paper start - Fire event for WindCharge explosions
8+
+ org.bukkit.event.entity.ExplosionPrimeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExplosionPrimeEvent(this, RADIUS, false);
9+
+ if (event.isCancelled()) {
10+
+ return;
11+
+ }
12+
+ // Paper end - Fire event for WindCharge explosions
13+
this.level()
14+
.explode(
15+
this,
16+
@@ -60,8 +_,8 @@
17+
pos.x(),
18+
pos.y(),
19+
pos.z(),
20+
- 1.2F,
21+
- false,
22+
+ event.getRadius(), // Paper - Fire event for WindCharge explosions
23+
+ event.getFire(), // Paper - Fire event for WindCharge explosions
24+
Level.ExplosionInteraction.TRIGGER,
25+
ParticleTypes.GUST_EMITTER_SMALL,
26+
ParticleTypes.GUST_EMITTER_LARGE,

0 commit comments

Comments
 (0)