Merge branch 'development'

This commit is contained in:
Brianna 2020-04-26 17:47:48 -04:00
commit 97fc3ea793
2 changed files with 16 additions and 6 deletions

View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId>
<artifactId>EpicVouchers</artifactId>
<modelVersion>4.0.0</modelVersion>
<version>2.1.17</version>
<version>2.1.18</version>
<build>
<defaultGoal>clean install</defaultGoal>
<finalName>EpicVouchers-${project.version}</finalName>

View File

@ -1,5 +1,8 @@
package com.songoda.epicvouchers.voucher;
import com.songoda.core.compatibility.ServerVersion;
import com.songoda.core.nms.NmsManager;
import com.songoda.core.nms.nbt.NBTItem;
import com.songoda.core.utils.TextUtils;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.events.ForceRedeemEvent;
@ -94,15 +97,22 @@ public class Voucher {
meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
}
if (unbreakable) {
meta.setUnbreakable(true);
}
if (hideAttributes) {
meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
meta.addItemFlags(ItemFlag.HIDE_UNBREAKABLE);
}
if (unbreakable) {
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_9)) {
meta.setUnbreakable(true);
item.setItemMeta(meta);
} else {
item.setItemMeta(meta);
NBTItem nbtItem = NmsManager.getNbt().of(item);
nbtItem.set("Unbreakable", (byte) 1);
item = nbtItem.finish();
}
}
return item;
}