diff --git a/patches/api/Add-Heightmap-API.patch b/patches/api/Add-Heightmap-API.patch
index ba5f316a34..2c5837e3aa 100644
--- a/patches/api/Add-Heightmap-API.patch
+++ b/patches/api/Add-Heightmap-API.patch
@@ -59,7 +59,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
 +    // Paper start - Add heightmap api
-+
 +    /**
 +     * Returns a copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ())
 +     * @return A copy of this location except with y = getWorld().getHighestBlockYAt(this.getBlockX(), this.getBlockZ())
@@ -97,11 +96,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        ret.setY(this.getWorld().getHighestBlockYAt(this, heightMap));
 +        return ret;
 +    }
-+    // Paper end
++    // Paper end - Add heightmap api
 +
+     // Paper start - Expand Explosions API
      /**
       * Creates explosion at this location with given power
-      *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/World.java
diff --git a/patches/api/Expand-Explosions-API.patch b/patches/api/Expand-Explosions-API.patch
index 9a8c8d1d5d..0c731379f3 100644
--- a/patches/api/Expand-Explosions-API.patch
+++ b/patches/api/Expand-Explosions-API.patch
@@ -21,6 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return centerLoc;
      }
  
++    // Paper start - Expand Explosions API
 +    /**
 +     * Creates explosion at this location with given power
 +     *
@@ -98,9 +99,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param breakBlocks Whether or not to have blocks be destroyed
 +     * @return false if explosion was canceled, otherwise true
 +     */
-+    public boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
++    public boolean createExplosion(@Nullable Entity source, float power, boolean setFire, boolean breakBlocks) {
 +        return this.getWorld().createExplosion(source, this, power, setFire, breakBlocks);
 +    }
++    // Paper end - Expand Explosions API
 +
      /**
       * Returns a list of entities within a bounding box centered around a Location.