Merge branch 'ver/1.21.11' into feat/lightning-affects-blocks

purpur-api/paper-patches/features/0001-Rebrand.patch

@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: granny <granny@purpurmc.org>
+Date: Thu, 16 May 2024 19:11:29 -0700
+Subject: [PATCH] Rebrand
+
+
+diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
+index 652ff54e7c50412503725d628bfe72ed03059790..fb1fe2651e53a9bf46b3632c638e13eea9dcda93 100644
+--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
++++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
+@@ -19,6 +19,12 @@ public interface ServerBuildInfo {
+      */
+     Key BRAND_PAPER_ID = Key.key("papermc", "paper");
+ 
++    // Purpur start
++    /**
++     * The brand id for Purpur.
++     */
++    Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur");
++    // Purpur end
+     /**
+      * Gets the {@code ServerBuildInfo}.
+      *

purpur-api/paper-patches/features/0002-Purpur-config-files.patch

@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <Blake.Galbreath@GMail.com>
+Date: Tue, 18 Feb 2020 20:30:03 -0600
+Subject: [PATCH] Purpur config files
+
+
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index bd8123503132b742d873c18486c3d19024fb9898..a17790d2da3008927b79814629e073b2091ce421 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -2425,6 +2425,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+         }
+         // Paper end
+ 
++        // Purpur start
++        @NotNull
++        public org.bukkit.configuration.file.YamlConfiguration getPurpurConfig() {
++            throw new UnsupportedOperationException("Not supported yet.");
++        }
++
++        @NotNull
++        public java.util.Properties getServerProperties() {
++            throw new UnsupportedOperationException("Not supported yet.");
++        }
++        // Purpur end
++
+         /**
+          * Sends the component to the player
+          *

purpur-api/paper-patches/features/0003-lightning-transforms-blocks.patch

@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: granny <contact@granny.dev>
+Date: Wed, 17 Dec 2025 20:20:00 -0800
+Subject: [PATCH] lightning transforms blocks
+
+
+diff --git a/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java b/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
+index a16aadadae7b70a8f3140478feb8846b7fec13ff..e79db0f2e80fc2a5521f9ccc34009f31c4baa04f 100644
+--- a/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
++++ b/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java
+@@ -16,6 +16,7 @@ public class LightningStrikeEvent extends WeatherEvent implements Cancellable {
+ 
+     private final LightningStrike bolt;
+     private final Cause cause;
++    private final java.util.List<org.bukkit.block.BlockState> blocks; // Purpur - lightning transforms blocks
+ 
+     private boolean cancelled;
+ 
+@@ -27,9 +28,16 @@ public class LightningStrikeEvent extends WeatherEvent implements Cancellable {
+ 
+     @ApiStatus.Internal
+     public LightningStrikeEvent(@NotNull final World world, @NotNull final LightningStrike bolt, @NotNull final Cause cause) {
++    // Purpur start - lightning transforms blocks
++        this(world, bolt, cause, new java.util.ArrayList<>());
++    }
++    @ApiStatus.Internal
++    public LightningStrikeEvent(@NotNull final World world, @NotNull final LightningStrike bolt, @NotNull final Cause cause, @NotNull final java.util.List<org.bukkit.block.BlockState> blocks) {
++    // Purpur end - lightning transforms blocks
+         super(world);
+         this.bolt = bolt;
+         this.cause = cause;
++        this.blocks = blocks; // Purpur - lightning transforms blocks
+     }
+ 
+     /**
+@@ -62,6 +70,21 @@ public class LightningStrikeEvent extends WeatherEvent implements Cancellable {
+         this.cancelled = cancel;
+     }
+ 
++    // Purpur start - lightning transforms blocks
++    /**
++     * Get a list of all blocks that will be modified by the lightning strike.
++     * <br>
++     * This list is mutable and contains the blocks in their changed state, i.e.
++     * having a type of {@link org.bukkit.Material#GLASS}.
++     *
++     * @return list of the modified blocks.
++     */
++    @NotNull
++    public java.util.List<org.bukkit.block.BlockState> getBlocks() {
++        return blocks;
++    }
++    // Purpur end - lightning transforms blocks
++
+     @NotNull
+     @Override
+     public HandlerList getHandlers() {