Upstream
/
UltimateStacker
mirror of https://github.com/songoda/UltimateStacker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fallback blacklist logic

This commit is contained in:
jascotty2 2019-09-10 13:25:48 -05:00
parent ce60a0bb98
commit 7a406283a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/songoda/ultimatestacker/UltimateStacker.java
View File

@ -380,8 +380,6 @@ public class UltimateStacker extends SongodaPlugin {
String name = TextUtils.convertToInvisibleString("IS") + Methods.compileItemName(itemStack, newAmount);
boolean blacklisted = isMaterialBlacklisted(itemStack);
//boolean blacklisted = ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)
// ? isMaterialBlacklisted(material) : isMaterialBlacklisted(material, itemStack.getData().getData());
if (newAmount > 32 && !blacklisted) {
item.setMetadata("US_AMT", new FixedMetadataValue(INSTANCE, newAmount));
@ -441,7 +439,9 @@ public class UltimateStacker extends SongodaPlugin {
public static boolean isMaterialBlacklisted(ItemStack item) {
CompatibleMaterial mat = CompatibleMaterial.getMaterial(item);
if(mat == null) {
return false;
// this shouldn't happen, but just in case?
return item == null ? false : (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)
? isMaterialBlacklisted(item.getType()) : isMaterialBlacklisted(item.getType(), item.getData().getData()));
} else if (mat.usesData()) {
return isMaterialBlacklisted(mat.name()) || isMaterialBlacklisted(mat.getMaterial(), mat.getData());
} else {