From 556e83c2ece8abac18a6a7442bd70063c0d7851d Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Fri, 28 Jul 2023 23:20:01 -0700
Subject: [PATCH] fix bad method call in PreBlockExplodeEvent event

---
 patches/api/0052-Add-PreExplodeEvents.patch    | 10 ++++++----
 patches/server/0299-Add-PreExplodeEvents.patch |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/patches/api/0052-Add-PreExplodeEvents.patch b/patches/api/0052-Add-PreExplodeEvents.patch
index 943406e24..5ba7e435d 100644
--- a/patches/api/0052-Add-PreExplodeEvents.patch
+++ b/patches/api/0052-Add-PreExplodeEvents.patch
@@ -6,17 +6,19 @@ Subject: [PATCH] Add PreExplodeEvents
 
 diff --git a/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java b/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b7db0db7f3afbccdb07390d1bcada109e9e6b30b
+index 0000000000000000000000000000000000000000..32602b398ede24a35ed8a996faa2b23455615a7b
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/event/PreBlockExplodeEvent.java
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,54 @@
 +package org.purpurmc.purpur.event;
 +
 +import org.bukkit.block.Block;
++import org.bukkit.block.BlockState;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.block.BlockExplodeEvent;
 +import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
 +import java.util.Collections;
 +
 +/**
@@ -27,8 +29,8 @@ index 0000000000000000000000000000000000000000..b7db0db7f3afbccdb07390d1bcada109
 +    private boolean cancelled;
 +    private final float yield;
 +
-+    public PreBlockExplodeEvent(@NotNull final Block what, final float yield) {
-+        super(what, Collections.emptyList(), yield);
++    public PreBlockExplodeEvent(@NotNull final Block what, final float yield, @Nullable BlockState explodedBlockState) {
++        super(what, Collections.emptyList(), yield, explodedBlockState);
 +        this.yield = yield;
 +        this.cancelled = false;
 +    }
diff --git a/patches/server/0299-Add-PreExplodeEvents.patch b/patches/server/0299-Add-PreExplodeEvents.patch
index 6f4cf8adc..ccc7f7b93 100644
--- a/patches/server/0299-Add-PreExplodeEvents.patch
+++ b/patches/server/0299-Add-PreExplodeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PreExplodeEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index dcc3b333f3647631e2fb695d0854036d3bc009be..6772c4584f1d243df76b42a730376247c8f04e3b 100644
+index dcc3b333f3647631e2fb695d0854036d3bc009be..4932374ab9a3d8582fb0ef024d817ad896dd23c4 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -141,6 +141,23 @@ public class Explosion {
@@ -22,7 +22,7 @@ index dcc3b333f3647631e2fb695d0854036d3bc009be..6772c4584f1d243df76b42a730376247
 +            }
 +        }else {
 +            Location location = new Location(this.level.getWorld(), this.x, this.y, this.z);
-+            if(!new org.purpurmc.purpur.event.PreBlockExplodeEvent(location.getBlock(), this.blockInteraction == Explosion.BlockInteraction.DESTROY_WITH_DECAY ? 1.0F / this.radius : 1.0F).callEvent()) {
++            if(!new org.purpurmc.purpur.event.PreBlockExplodeEvent(location.getBlock(), this.blockInteraction == Explosion.BlockInteraction.DESTROY_WITH_DECAY ? 1.0F / this.radius : 1.0F, this.damageSource.explodedBlockState).callEvent()) {
 +                this.wasCanceled = true;
 +                return;
 +            }