Merge branch 'ver/26.1.2' into fix-non-persistent-enderchest-rows

Author: GoodrichDev

gradle.properties

@@ -3,7 +3,7 @@ group = org.purpurmc.purpur
 mcVersion = 26.1.2
 apiVersion = 26.1.2
 channel=EXPERIMENTAL
-paperCommit = 6bac3c95bf36bb1e8a309ff1b5062a8b2b7de07f
+paperCommit = 3611a815e6b331199f8e6edd594d62c0cb995aee
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true

purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch

@@ -170,7 +170,7 @@
                  ? this.getDestroyType(GameRules.MOB_EXPLOSION_DROP_DECAY)
                  : Explosion.BlockInteraction.KEEP;
              case TNT -> this.getDestroyType(GameRules.TNT_EXPLOSION_DROP_DECAY);
-@@ -2910,7 +_,7 @@
+@@ -2909,7 +_,7 @@
              // Spigot start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                  // Paper start - Fix merchant inventory not closing on entity removal

purpur-server/paper-patches/features/0005-Setting-to-reintroduce-end-void-rings.patch

@@ -25,10 +25,10 @@ index 569b46cce9d5207380a9391e969e3a6aa790717b..a0cf70f1ccbb78f058e8ac5fc95bcb5b
      }
 
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index cae151f0c6ecfc0dee3c2f7df29fd2bef075b74f..6df4d6fe4bb9906127d266c156973ac777cae56d 100644
+index 1ab7f28e2ba386c68b9c70617c816b0b55fd796d..1446423550b6637aa955a1fa079f6c5d222093df 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -292,6 +292,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -293,6 +293,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          for (NodePath path : RemovedConfigurations.REMOVED_GLOBAL_PATHS) {
              builder.addAction(path, TransformAction.remove());
          }

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1902,6 +_,52 @@
+@@ -1906,6 +_,52 @@
          return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
      }