spigot-mirror/bukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/bukkit.git synced 2025-08-21 05:44:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPIGOT-4253: Add way to prioritise item conversion

Browse source
This commit is contained in:
md_5 2018-08-11 17:43:31 +10:00
parent c5ab54d891
commit 1f85e52623
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/bukkit/UnsafeValues.java
View file

@ -23,6 +23,8 @@ public interface UnsafeValues {
Material fromLegacy(MaterialData material); Material fromLegacy(MaterialData material);
Material fromLegacy(MaterialData material, boolean itemPriority);
BlockData fromLegacy(Material material, byte data); BlockData fromLegacy(Material material, byte data);
int getDataVersion(); int getDataVersion();

2
src/main/java/org/bukkit/inventory/ItemStack.java
View file

@ -451,7 +451,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
type = Material.getMaterial(Material.LEGACY_PREFIX + (String) args.get("type")); type = Material.getMaterial(Material.LEGACY_PREFIX + (String) args.get("type"));
byte dataVal = (type.getMaxDurability() == 0) ? (byte) damage : 0; // Actually durable items get a 0 passed into conversion byte dataVal = (type.getMaxDurability() == 0) ? (byte) damage : 0; // Actually durable items get a 0 passed into conversion
type = Bukkit.getUnsafe().fromLegacy(new MaterialData(type, dataVal)); type = Bukkit.getUnsafe().fromLegacy(new MaterialData(type, dataVal), true);
// We've converted now so the data val isn't a thing and can be reset // We've converted now so the data val isn't a thing and can be reset
if (dataVal != 0) { if (dataVal != 0) {