From 8e586f717c0cd8010340e2759c95702b02c7d9fb Mon Sep 17 00:00:00 2001
From: lexikiq <noellekiq@gmail.com>
Date: Sat, 15 May 2021 13:35:23 -0400
Subject: [PATCH] Fix NPE crash from NMS Explosion#getBukkitLocation

---
 ...7-Add-origin-location-to-EntityDamageByBlockEvent.patch | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/patches/server/0007-Add-origin-location-to-EntityDamageByBlockEvent.patch b/patches/server/0007-Add-origin-location-to-EntityDamageByBlockEvent.patch
index 3ac3c5a..d972aa1 100644
--- a/patches/server/0007-Add-origin-location-to-EntityDamageByBlockEvent.patch
+++ b/patches/server/0007-Add-origin-location-to-EntityDamageByBlockEvent.patch
@@ -51,15 +51,16 @@ index 53ea8a6d90faf4f7f8fd0819be4499422bdd4cbe..344504de9714c4e5398a0fb32c026045
      }
  }
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 79008bda42558ea7d28ccf51b66405a3bdb52da7..f3c4bea06536492931c4f565fd1a9f640cce6188 100644
+index 79008bda42558ea7d28ccf51b66405a3bdb52da7..8fd81f4238416fd6a5d09e3307aebe785f8e28e1 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -85,6 +85,12 @@ public class Explosion {
+@@ -85,6 +85,13 @@ public class Explosion {
          this.l = explosiondamagecalculator == null ? this.a(entity) : explosiondamagecalculator;
      }
  
 +    // Parchment start
-+    public org.bukkit.Location getBukkitLocation() {
++    public @Nullable org.bukkit.Location getBukkitLocation() {
++        if (this.world == null) return null;
 +        return new org.bukkit.Location(world.getWorld(), posX, posY, posZ);
 +    }
 +    // Parchment end