Revert "Add the option for explosions to damage the explosion cause"

This reverts commit f233855.

patches/api/0112-Expand-Explosions-API.patch

@@ -108,7 +108,7 @@ index 3161eae2fa5f03b7d3a5e9945ab659c15cf568c6..af737017ee397f80c44ee02c6cc60cef
      /**
       * Returns a list of entities within a bounding box centered around a Location.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 44a74f15bea60ecd8380520e8faaea41a6c261c5..8462745daa02c8102b70e657e1a7569efaa8cac7 100644
+index 44a74f15bea60ecd8380520e8faaea41a6c261c5..50c1e4957f66826feb0a2eb04293dbd6b5595700 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1424,6 +1424,88 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -200,35 +200,3 @@ index 44a74f15bea60ecd8380520e8faaea41a6c261c5..8462745daa02c8102b70e657e1a7569e
      /**
       * Creates explosion at given coordinates with given power and optionally
       * setting blocks on fire or breaking blocks.
-@@ -1455,6 +1537,31 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
-      */
-     public boolean createExplosion(@NotNull Location loc, float power, boolean setFire, boolean breakBlocks, @Nullable Entity source);
-
-+    // Paper start - Add the option for explosions to damage the explosion cause
-+    /**
-+     * Creates explosion at given coordinates with given power and optionally
-+     * setting blocks on fire, breaking blocks, or damaging the explosion
-+     * cause.
-+     * <p>
-+     * Note that if a non-null {@code source} Entity is provided and {@code
-+     * breakBlocks} is {@code true}, the value of {@code breakBlocks} will be
-+     * ignored if {@link GameRule#MOB_GRIEFING} is {@code false} in the world
-+     * in which the explosion occurs. In other words, the mob griefing gamerule
-+     * will take priority over {@code breakBlocks} if explosions are not allowed.
-+     *
-+     * @param x The x component of the location to blow up
-+     * @param y The y component of the location to blow up
-+     * @param z The z component of the location to blow up
-+     * @param power The power of explosion, where 4F is TNT
-+     * @param setFire Whether or not to set blocks on fire
-+     * @param breakBlocks Whether or not to have blocks be destroyed
-+     * @param source the source entity, used for tracking damage
-+     * @param shouldDamageSource Whether or not to damage the {@code source} entity
-+     * @return false if explosion was canceled, otherwise true
-+     */
-+    public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, @Nullable Entity source, boolean shouldDamageSource);
-+    // Paper end - Add the option for explosions to damage the explosion cause
-+
-     /**
-      * Gets the current PVP setting for this world.
-      *

patches/api/0166-Fix-Spigot-annotation-mistakes.patch

@@ -618,7 +618,7 @@ index e455eb21abf121dc6ff10ff8a13dd06f67096a8f..bbc01e7c192ae6689c301670047ff114
          return origin;
      }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 51302cac3e18897ba476e209f8d4a8c7e9d86aa0..d7c8d145e497efe1273ecddf506d28e243255ee3 100644
+index fcdc5d83621acff5f9210585455be1ea50abb77c..216995288f6b8b407ef8240411b5ed4713379a7a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -418,9 +418,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -632,15 +632,15 @@ index 51302cac3e18897ba476e209f8d4a8c7e9d86aa0..d7c8d145e497efe1273ecddf506d28e2
      public boolean refreshChunk(int x, int z);
 
      /**
-@@ -3822,6 +3821,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3797,6 +3796,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
 
      // Spigot start
 +    @Deprecated(forRemoval = true) // Paper
      public class Spigot {
 
          /**
-@@ -3855,7 +3855,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3830,7 +3830,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
          }
      }
 
@@ -652,7 +652,7 @@ index 51302cac3e18897ba476e209f8d4a8c7e9d86aa0..d7c8d145e497efe1273ecddf506d28e2
      Spigot spigot();
      // Spigot end
 
-@@ -4073,9 +4077,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4048,9 +4052,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
           * Gets the dimension ID of this environment
           *
           * @return dimension ID
@@ -664,7 +664,7 @@ index 51302cac3e18897ba476e209f8d4a8c7e9d86aa0..d7c8d145e497efe1273ecddf506d28e2
          public int getId() {
              return id;
          }
-@@ -4085,9 +4089,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4060,9 +4064,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
           *
           * @param id The ID of the environment
           * @return The environment

patches/api/0260-More-World-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d7c8d145e497efe1273ecddf506d28e243255ee3..feeaa13906893f7a9f7ffd97141891ca97f89e3c 100644
+index 216995288f6b8b407ef8240411b5ed4713379a7a..d3fc033aba36c5fd99846e9200ed0071fddd6045 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3820,6 +3820,72 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3795,6 +3795,72 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
 

patches/api/0348-Expand-FallingBlock-API.patch

@@ -10,10 +10,10 @@ Subject: [PATCH] Expand FallingBlock API
 Co-authored-by: Lukas Planz <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index de9709c923a376e8bb3f969202ff90341dbb655a..30568eaf1dde1f55ca7388c08c5040b0b98a1467 100644
+index 8e9ab00503167799c6c929d00e48c07cb328848c..907906e15c9250fea385e49f10d3c248236fd004 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2253,8 +2253,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2228,8 +2228,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The spawned {@link FallingBlock} instance
       * @throws IllegalArgumentException if {@link Location} or {@link
       *     MaterialData} are null or {@link Material} of the {@link MaterialData} is not a block
@@ -24,7 +24,7 @@ index de9709c923a376e8bb3f969202ff90341dbb655a..30568eaf1dde1f55ca7388c08c5040b0
      public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull MaterialData data) throws IllegalArgumentException;
 
      /**
-@@ -2267,8 +2269,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2242,8 +2244,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The spawned {@link FallingBlock} instance
       * @throws IllegalArgumentException if {@link Location} or {@link
       *     BlockData} are null
@@ -35,7 +35,7 @@ index de9709c923a376e8bb3f969202ff90341dbb655a..30568eaf1dde1f55ca7388c08c5040b0
      public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull BlockData data) throws IllegalArgumentException;
 
      /**
-@@ -2285,7 +2289,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2260,7 +2264,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The spawned {@link FallingBlock} instance
       * @throws IllegalArgumentException if {@link Location} or {@link
       *     Material} are null or {@link Material} is not a block

patches/api/0456-More-Raid-API.patch

@@ -39,10 +39,10 @@ index 983a8c20a06d2b509602b27f49c090598b8ecc42..fa98599e3eee37bf68f0e9813497c718
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index da3d2f7519ecfbbfa5eeeddc5f00ec7c4490bffb..45f71a36f1e3788998a2c740bb811d8473cec99a 100644
+index ecc2d486cfec79cce27a947dfeed4853575a594d..d8a23aa0d898ca3360757721e38ddb97387f7d21 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4136,6 +4136,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4111,6 +4111,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public Raid locateNearestRaid(@NotNull Location location, int radius);
 

patches/server/0009-MC-Utils.patch

@@ -4438,7 +4438,7 @@ index 40adb6117b9e0d5f70103113202a07715e403e2a..c9cab509796599b13ca3422de1049aed
          long j = Util.getNanos() - i;
          int k = this.tickCount % 100;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 2a49fa50c580282200e7a055340e3761f787d868..450b2d1525167a75234aa27fd6a4d9852bef54be 100644
+index f40a2f348c45a29168ca3d4eef07b5b628060bee..9a009a688c02e990723917766c51e1c0e71e338d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
 @@ -37,9 +37,9 @@ public class ChunkHolder extends GenerationChunkHolder {
@@ -4719,7 +4719,7 @@ index 5b920beb39dad8d392b4e5e12a89880720e41942..449608e60f3900778247101581ff598f
          protected ChunkDistanceManager(final Executor workerExecutor, final Executor mainThreadExecutor) {
              super(workerExecutor, mainThreadExecutor);
 diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
-index 5f628d5f9183586be057605cb1cf75ae05000d84..5a34141cace31eb6675fed21baefd887e5e7fec0 100644
+index b6cc33943fe7e4667944f3e6f868b3033ea9ca18..3d46412b307f08968bb9b96c0649e0405813462e 100644
 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
 +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
 @@ -365,7 +365,7 @@ public abstract class DistanceManager {
@@ -4947,7 +4947,7 @@ index ff1a8e62d2bb3de62e0c27b2335cb512ea91dedd..cb136a30287a17947ed018cdc48e6f91
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/level/TicketType.java b/src/main/java/net/minecraft/server/level/TicketType.java
-index 70789fc34c0b1cc83e111c2cb90093d61890ecd6..b469c412e3086c543644a1ab1d72a27c52273753 100644
+index 045b754b5b70bbd1e7732ad2142dfadd6cc2305c..f56e5c0f53f9b52a9247b9be9265b949494fc924 100644
 --- a/src/main/java/net/minecraft/server/level/TicketType.java
 +++ b/src/main/java/net/minecraft/server/level/TicketType.java
 @@ -7,6 +7,7 @@ import net.minecraft.util.Unit;
@@ -4959,7 +4959,7 @@ index 70789fc34c0b1cc83e111c2cb90093d61890ecd6..b469c412e3086c543644a1ab1d72a27c
      private final String name;
      private final Comparator<T> comparator;
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 2d78a6fb4f148ea4c1fefc48de0997567e273bb0..a9a5526bd1e62050a6a0a84599f6ed0da28d6007 100644
+index 7d69da7e761ccfe736656e8c89dd1ae08956695f..421f146ea9c35b852251c0ddb29856c13e11aef3 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 @@ -169,6 +169,26 @@ public class WorldGenRegion implements WorldGenLevel {
@@ -5086,7 +5086,7 @@ index 5fa5c6fa8c143e1aa1dacc7a6b63b11ad4b074ec..5025f7f5d66f2aedd57db137ae2dc69c
      }
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index a46d07f3a268f1a1b197c85348fd6f7d4634c37d..5892ee05f8c3a3cab3825a10c78df25850c160ce 100644
+index 1c71d2c1b16bdba1e14a8230787e4cb4ad530163..d6d8bbc98fc71997cb52521d59ebb59d727d3c22 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
 @@ -9,6 +9,7 @@ import javax.annotation.Nullable;
@@ -5365,7 +5365,7 @@ index e0594a1c381487b43bfc55212044e1b3122cee66..59fcaca90b67c03e1a6799e58061dbae
 
          public boolean useShapeForLightOcclusion() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-index ddf82f2fcb4fbb86c0a255109a5b94223b18405a..ca62b783eedf24f1749e07bdb293819510dce758 100644
+index 35c4bf87870c0dfa1f648547115238dacbb87426..db4d95ce98eb1490d5306d1f74b282d27264871a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
 @@ -65,7 +65,7 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
@@ -5488,7 +5488,7 @@ index 5b73fcfe278f57de249f3a96da58dc08eda7aff6..25380a44e5cc94f3924cfee6a03c3091
 
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index cf3cd5312caef65ee357990d3f11c8c7bb494b9e..9e7105c029611c2d2d4ab10da06dcc4856c736b9 100644
+index ca4c8f74a1ab2a8b36e193a2c40c3bd76565d258..2c153af611399e884752f8256bee4fe32de5c572 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 @@ -19,7 +19,7 @@ public class LevelChunkSection {
@@ -5524,7 +5524,7 @@ index ae16b014abd52ee10d523fb003cce166b846b222..7f302405a88766c2112539d24d3dd2e5
      public BlockState getBlockState(BlockPos pos) {
          int i = pos.getY();
 diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
-index c6a8ad35409d9acdf74932ed64e5833322705db9..fe1fadaf266e997c50485cfa09c2bde158d58e0f 100644
+index 34933c5324126f9afdc5cba9dea997ace8f01806..1cfc906317f07a44f06a4adf021c44e34a2f1d07 100644
 --- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 +++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 @@ -91,6 +91,18 @@ public class PersistentEntitySectionManager<T extends EntityAccess> implements A
@@ -5680,7 +5680,7 @@ index 4cbf0d797fc2d57c822877c111698b2077399d32..9cd22b09b295ecd95d17d1dd5edb96f9
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 0652ed7eac547227cbeaf680cd76bee3782f109c..31cf632156a2baf8063cb9ef27a0e16b8abf577d 100644
+index 952c6ebde7031dc060efe98992f82c02bf3534ea..17fa2d3db112762bcb8b941b69b8ddcc53f47224 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -23,6 +23,20 @@ import org.jetbrains.annotations.ApiStatus;
@@ -5705,7 +5705,7 @@ index 0652ed7eac547227cbeaf680cd76bee3782f109c..31cf632156a2baf8063cb9ef27a0e16b
          if (original instanceof CraftItemStack) {
              CraftItemStack stack = (CraftItemStack) original;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java
-index b90bb964530ee8a48fc7bfca723d008e7cbfd854..ca43cf596aaddefb706bdaaa2d2d3f8087a19350 100644
+index 5fd6eb754c4edebed6798c65b06507a4e89ca48f..524b51a0ab808a0629c871ad813115abd4b49dbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java
 @@ -58,6 +58,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
@@ -5742,14 +5742,13 @@ index b90bb964530ee8a48fc7bfca723d008e7cbfd854..ca43cf596aaddefb706bdaaa2d2d3f80
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index 6dd43ad883226d8331cc132fa6098778aa28c7c4..a1f58db4a1016253107c65220c0589fed21febd4 100644
+index e837d76e833d73d888bc1dad3515c2b82bc0e437..4705aed1dd98378c146bf9e346df1a17f719ad36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 @@ -212,7 +212,23 @@ public class DummyGeneratorAccess implements WorldGenLevel {
      public FluidState getFluidState(BlockPos pos) {
          return Fluids.EMPTY.defaultFluidState(); // SPIGOT-6634
      }
--
 +    // Paper start - if loaded util
 +    @javax.annotation.Nullable
 +    @Override
@@ -5761,7 +5760,7 @@ index 6dd43ad883226d8331cc132fa6098778aa28c7c4..a1f58db4a1016253107c65220c0589fe
 +    public BlockState getBlockStateIfLoaded(BlockPos blockposition) {
 +        throw new UnsupportedOperationException("Not supported yet.");
 +    }
-+
+ 
 +    @Override
 +    public FluidState getFluidIfLoaded(BlockPos blockposition) {
 +        throw new UnsupportedOperationException("Not supported yet.");

patches/server/0064-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -19,7 +19,6 @@ index 812a4db4a91b887ef61b3ead9fa781561e6039ce..238ec25cc3109659d524fcc1de48afcd
          Preconditions.checkArgument(count >= 0, "New arrow amount must be >= 0");
 +        if (!fireEvent) { // Paper
          this.getHandle().getEntityData().set(net.minecraft.world.entity.LivingEntity.DATA_ARROW_COUNT_ID, count);
--    }
 +        // Paper start
 +        } else {
 +            this.getHandle().setArrowCount(count);
@@ -37,7 +36,7 @@ index 812a4db4a91b887ef61b3ead9fa781561e6039ce..238ec25cc3109659d524fcc1de48afcd
 +    @Override
 +    public int getNextArrowRemoval() {
 +        return this.getHandle().removeArrowTime;
-+    }
+     }
 +    // Paper end - Add methods for working with arrows stuck in living entities
 
      @Override

patches/server/0065-Chunk-Save-Reattempt.patch

@@ -19,7 +19,7 @@ index b24e8255ab18eb5b2e4968aa62aa3d72ef33f0eb..12b7d50f49a2184aaf220a4a50a137b2
              }
          }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index e9ab07a799e63ee6d93c70215ba03ad480a5cb7d..73e32a77f796a53ae1975d18fe31b4f02bae7346 100644
+index 40f2f4d052add3b4270d29c843e49fb621e1bc8d..df099d4c7f101f50d40dae99b45c271b02712434 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 @@ -134,6 +134,11 @@ public final class RegionFileStorage implements AutoCloseable {
@@ -38,14 +38,13 @@ index e9ab07a799e63ee6d93c70215ba03ad480a5cb7d..73e32a77f796a53ae1975d18fe31b4f0
                  dataoutputstream.close();
              }
          }
--
 +        // Paper start - Chunk save reattempt
 +                return;
 +            } catch (Exception ex)  {
 +                lastException = ex;
 +            }
 +        }
-+
+ 
 +        if (lastException != null) {
 +            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(lastException);
 +            net.minecraft.server.MinecraftServer.LOGGER.error("Failed to save chunk {}", pos, lastException);