aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0994-Proxy-ItemStack-to-CraftItemStack.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0994-Proxy-ItemStack-to-CraftItemStack.patch')
-rw-r--r--patches/server/0994-Proxy-ItemStack-to-CraftItemStack.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0994-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/0994-Proxy-ItemStack-to-CraftItemStack.patch
index c7dfc54b2e..a321d37f33 100644
--- a/patches/server/0994-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/server/0994-Proxy-ItemStack-to-CraftItemStack.patch
@@ -205,12 +205,12 @@ index 6cc9d7a9e6d4bfdc27e52fc581b2bb832616f121..6930d0afb230a88aa813b02e4d55c95d
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index f55733b7a56ac21cb297971b9e854ef54001ca26..8af9ac9e22a15457da12f0746d0e411942c278fb 100644
+index f0556a207f6d9d1766ef0d9753355f7fa5052dc1..2539802c0a02b6a564bdbd58e93ffe5685e775b9 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -681,6 +681,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -666,6 +666,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
}
- // Paper end - hack to get tags for non server-backed registries
+ // Paper end - lifecycle event API
+ // Paper start - proxy ItemStack
+ @Override