From 3850f35c91c4c321ba8f9af7375653b91ec9e232 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Mon, 4 Aug 2025 14:16:49 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c60f4436 Restore players being the inventory holder of an enderchest (#12923)
PaperMC/Paper@e9380882 Lazy evaluate ender chest inventory holder
PaperMC/Paper@846c64f4 Allow for sending plugin messages during configuration stage (#12915)
---
 gradle.properties                                             | 2 +-
 .../features/0003-Barrels-and-enderchests-6-rows.patch        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 83de045fc..4d7a79db9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.8-R0.1-SNAPSHOT
 
 mcVersion = 1.21.8
-paperCommit = bf465e002971815f08326af18efd9974056dd8f2
+paperCommit = 846c64f4d1852aa0079978c72a71883fd5039ee8
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch b/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch
index 6a59b994e..939608a61 100644
--- a/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch
+++ b/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch
@@ -84,10 +84,10 @@ index 0fffa384f928ab84451331380968fb4650eafe26..0399092c9f7a43ac100c11505176ade6
          return new ChestMenu(MenuType.GENERIC_9x6, containerId, playerInventory, container, 6);
      }
 diff --git a/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-index beb74bc8398de8b48f41af7daef14d624826310e..7ae8d115b6f4af45db9309b46ed4b4fdd8e25c08 100644
+index 51148b7b95c93a9e25da70ac9275c63f1458d84c..96359fef8c83b54ea65d4358aa5d594723b38ead 100644
 --- a/net/minecraft/world/inventory/PlayerEnderChestContainer.java
 +++ b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-@@ -25,11 +25,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
+@@ -26,11 +26,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
      }
  
      public PlayerEnderChestContainer(Player owner) {