Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-11-25 11:35:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix issue with durability not being set (Fixes #597)

Browse Source 
Previously there was no difference between 0 and "not set" but
 since 1.20.6 it's necessary to differentiate between them.
 This adjusts it so that the damage is no longer set to 0 if no
 value was in the item name string.
This commit is contained in:
Phoenix616 2024-06-19 13:30:17 +01:00
parent 07dd3c7a70
commit 32aa1403c9
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java
View File

@ -390,8 +390,8 @@ public class MaterialUtil {
split[i] = split[i].trim();
}
int durability = getDurability(itemName);
MaterialParseEvent parseEvent = new MaterialParseEvent(split[0], (short) durability);
Integer durability = getDurability(itemName);
MaterialParseEvent parseEvent = new MaterialParseEvent(split[0], durability != null ? durability.shortValue() : 0);
Bukkit.getPluginManager().callEvent(parseEvent);
Material material = parseEvent.getMaterial();
if (material == null) {
@ -402,10 +402,16 @@ public class MaterialUtil {
ItemMeta meta = getMetadata(itemName);
if (meta != null) {
if (durability != null) {
if (meta == null) {
meta = itemStack.getItemMeta();
}
if (meta instanceof Damageable) {
((Damageable) meta).setDamage(durability);
}
}
if (meta != null) {
itemStack.setItemMeta(meta);
}
@ -418,17 +424,17 @@ public class MaterialUtil {
* @param itemName Item name
* @return Durability found
*/
public static int getDurability(String itemName) {
public static Integer getDurability(String itemName) {
Matcher m = DURABILITY.matcher(itemName);
if (!m.find()) {
return 0;
return null;
}
String data = m.group();
if (data == null || data.isEmpty()) {
return 0;
return null;
}
data = data.substring(1);