diff options
| author | Shane Freeder <[email protected]> | 2024-07-26 19:36:48 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2024-07-26 19:36:48 +0100 |
| commit | 5a3f00cd55d14d023e27051f2705621394d27696 (patch) | |
| tree | 6a7ef8436a1f4adf6ecf3005af4221fd2a5368a0 /patches/server/1025-Make-a-PDC-view-accessible-directly-from-ItemStack.patch | |
| parent | efa2eb52ba0703504ee35a65ff37a20b4a158e73 (diff) | |
| parent | e1462a925344bc038818dd88871af0139ee35958 (diff) | |
| download | Paper-5a3f00cd55d14d023e27051f2705621394d27696.tar.gz Paper-5a3f00cd55d14d023e27051f2705621394d27696.zip | |
Merge remote-tracking branch 'origin/master' into patch/early-l4j-shutdown-hookpatch/early-l4j-shutdown-hook
Diffstat (limited to 'patches/server/1025-Make-a-PDC-view-accessible-directly-from-ItemStack.patch')
| -rw-r--r-- | patches/server/1025-Make-a-PDC-view-accessible-directly-from-ItemStack.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/1025-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/1025-Make-a-PDC-view-accessible-directly-from-ItemStack.patch index dfe7018329..430f84e5a5 100644 --- a/patches/server/1025-Make-a-PDC-view-accessible-directly-from-ItemStack.patch +++ b/patches/server/1025-Make-a-PDC-view-accessible-directly-from-ItemStack.patch @@ -97,10 +97,10 @@ index 0000000000000000000000000000000000000000..fac401280d3f3689b00e16c19155ca75 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 08a1e8087b4f948ae31a3c3ef453261dc3dbc287..d562b17a96431dcff18fe648542f507a8fd354d7 100644 +index f4c7b0e2db55ad9cdf09da80f6756f941315fb30..40fb5b5e00f6bc82e67d318b8b3d1e7606973f52 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -@@ -482,4 +482,63 @@ public final class CraftItemStack extends ItemStack { +@@ -484,4 +484,63 @@ public final class CraftItemStack extends ItemStack { return mirrored; } // Paper end |