mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-25 06:03:03 +02:00
* Expose server build information * squash patches * final tweaks --------- Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: masmc05 <masmc05@gmail.com>
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Tue, 26 Mar 2024 21:42:23 -0400
|
|
Subject: [PATCH] Deprecate ItemStack#setType
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
|
index 2ba771efa61e109804f3141e95f77613ac952ed1..6b794776c1e7a00b7a00a1379cf559be182996cd 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
|
@@ -715,4 +715,24 @@ public final class CraftItemStack extends ItemStack {
|
|
static boolean hasItemMeta(net.minecraft.world.item.ItemStack item) {
|
|
return !(item == null || item.getComponentsPatch().isEmpty());
|
|
}
|
|
+ // Paper start - with type
|
|
+ @Override
|
|
+ public ItemStack withType(final Material type) {
|
|
+ if (type == Material.AIR) {
|
|
+ return CraftItemStack.asCraftMirror(null);
|
|
+ }
|
|
+
|
|
+ final net.minecraft.world.item.ItemStack copy = new net.minecraft.world.item.ItemStack(
|
|
+ CraftItemType.bukkitToMinecraft(type), this.getAmount()
|
|
+ );
|
|
+
|
|
+ if (this.handle != null) {
|
|
+ copy.applyComponents(this.handle.getComponentsPatch());
|
|
+ }
|
|
+
|
|
+ final CraftItemStack mirrored = CraftItemStack.asCraftMirror(copy);
|
|
+ mirrored.setItemMeta(mirrored.getItemMeta());
|
|
+ return mirrored;
|
|
+ }
|
|
+ // Paper end
|
|
}
|