mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
Date: Tue, 2 Jan 2024 10:35:46 -0800
|
||
|
|
Subject: [PATCH] fix ItemMeta removing CustomModelData
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||
|
|
index 182bc05a839781794188352120968fdf67e794e7..aa013e778df40b0ea5fbfd8604f76f9de873d087 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||
|
|
@@ -380,7 +380,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (tag.contains(CraftMetaItem.CUSTOM_MODEL_DATA.NBT, CraftMagicNumbers.NBT.TAG_INT)) {
|
||
|
|
+ if (tag.contains(CraftMetaItem.CUSTOM_MODEL_DATA.NBT, CraftMagicNumbers.NBT.TAG_ANY_NUMBER)) { // Paper - correctly allow any number type
|
||
|
|
this.customModelData = tag.getInt(CraftMetaItem.CUSTOM_MODEL_DATA.NBT);
|
||
|
|
}
|
||
|
|
if (tag.contains(CraftMetaItem.BLOCK_DATA.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) {
|