summaryrefslogtreecommitdiffhomepage
path: root/patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-09-22 21:02:06 +0200
committerGitHub <[email protected]>2024-09-22 21:02:06 +0200
commit81d94483a2ca1eee317e7ee7adc11617cb11728d (patch)
tree145dce620f3b1715d182e290f91906cbf36785ae /patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch
parent1cb2bf466fb9fc42134be7e18d160f991d353fdf (diff)
downloadPaper-81d94483a2ca1eee317e7ee7adc11617cb11728d.tar.gz
Paper-81d94483a2ca1eee317e7ee7adc11617cb11728d.zip
Add ItemStack array serialization methods (#10387)
Diffstat (limited to 'patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch')
-rw-r--r--patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch b/patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch
index bd8435d922..86591d4e30 100644
--- a/patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/api/0475-Proxy-ItemStack-to-CraftItemStack.patch
@@ -16,7 +16,7 @@ index 9bdba60fa96edbc4be5dcf54a815579db887048b..330e3013eda204aa9b33d5e1c3104e0b
+ ItemStack createEmptyStack(); // Paper - proxy ItemStack
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 1d2ffdf88daa9186993c69c5ab2b96520b41920b..4fe68a22576933676271f841a5af0ee45b90216f 100644
+index e80261e0e66e6d3969513593dbbf3d890158676c..9464c27fe536fc5765d945631215cbe90fd5fa47 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -28,10 +28,38 @@ import org.jetbrains.annotations.Nullable;
@@ -412,7 +412,7 @@ index 1d2ffdf88daa9186993c69c5ab2b96520b41920b..4fe68a22576933676271f841a5af0ee4
@Override
@NotNull
-@@ -807,11 +747,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -894,11 +834,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
}
public int getMaxItemUseDuration(@NotNull final org.bukkit.entity.LivingEntity entity) {
@@ -425,7 +425,7 @@ index 1d2ffdf88daa9186993c69c5ab2b96520b41920b..4fe68a22576933676271f841a5af0ee4
}
/**
-@@ -1061,7 +997,8 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1148,7 +1084,8 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
*/
@NotNull
public static ItemStack empty() {
@@ -435,7 +435,7 @@ index 1d2ffdf88daa9186993c69c5ab2b96520b41920b..4fe68a22576933676271f841a5af0ee4
}
/**
-@@ -1069,7 +1006,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1156,7 +1093,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
* it is either air or the stack has a size of 0.
*/
public boolean isEmpty() {