From 722c7ccb57cd0750d5e392bfb39494001aaafaca Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Fri, 30 Jul 2021 11:37:11 +0200
Subject: [PATCH] Fix closeInventory shenanigans (#6292)

---
 .../Add-additional-open-container-api-to-HumanEntity.patch    | 2 +-
 patches/server/InventoryCloseEvent-Reason-API.patch           | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/patches/server/Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/Add-additional-open-container-api-to-HumanEntity.patch
index c35cfeb1d7..408fbd3023 100644
--- a/patches/server/Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/Add-additional-open-container-api-to-HumanEntity.patch
@@ -78,4 +78,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
      @Override
      public void closeInventory() {
-         this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.PLUGIN);
+         // Paper start
diff --git a/patches/server/InventoryCloseEvent-Reason-API.patch b/patches/server/InventoryCloseEvent-Reason-API.patch
index 4a116f6663..5185d3a638 100644
--- a/patches/server/InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/InventoryCloseEvent-Reason-API.patch
@@ -171,10 +171,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public void closeInventory() {
 -        this.getHandle().closeContainer();
-+        this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.PLUGIN);
-+        getHandle().closeContainer();
 +        // Paper start
-+        getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.PLUGIN);
++        this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.PLUGIN);
      }
 +    @Override
 +    public void closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {