From 9db5be5a7460f51e9ba9396083dffa83dcb4e2a7 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Thu, 17 Mar 2022 07:00:47 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@8788bf7 fix datapacks not being able to modify nether/end (#7588)
PaperMC/Paper@b8c90d2 Added method to check snapshot state of TileStates (#7325)
PaperMC/Paper@8897cea Add enchantWithLevels API (#7615)
---
 gradle.properties                                    | 2 +-
 patches/api/0019-ItemStack-convenience-methods.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index eb23914a9..d64a73e74 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.18.2-R0.1-SNAPSHOT
 
-paperCommit = f0d0078debda4e6b306cf53a697e798cc2cd084d
+paperCommit = 8897cea0b05d9b5f110ed5f153a00daee32875c4
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0019-ItemStack-convenience-methods.patch b/patches/api/0019-ItemStack-convenience-methods.patch
index be5fac4c0..93896476e 100644
--- a/patches/api/0019-ItemStack-convenience-methods.patch
+++ b/patches/api/0019-ItemStack-convenience-methods.patch
@@ -49,7 +49,7 @@ index ef7054fec75d91082be27fdd2a06469f37a6c174..d410cc574c941a348d7130bf1709859c
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 7dfc84c77d8e185bb0513d9f9c603ce1b501a5e0..f5a696e5951f01fc7f5ab285561dc9777c74228f 100644
+index 56897cfb96b53e43fec343568e514ee636ddd5c5..c6d2dfd7ec22c168b8bf348174ed25ee30a5c5cf 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -71,7 +71,7 @@ index 7dfc84c77d8e185bb0513d9f9c603ce1b501a5e0..f5a696e5951f01fc7f5ab285561dc977
  
  /**
   * Represents a stack of items.
-@@ -957,4 +969,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
+@@ -975,4 +987,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
          return Bukkit.getUnsafe().isValidRepairItemStack(toBeRepaired, this);
      }
      // Paper end