mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Renamed meta to snapshot since it is one

Browse Source
This commit is contained in:
Sfiguz7 2021-10-01 17:18:48 +02:00
parent e64cb10447
commit dc45346c7a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java
View File

@ -314,15 +314,15 @@ public final class SlimefunUtils {
}
}
private static boolean equalsItemMeta(@Nonnull ItemMeta itemMeta, @Nonnull ItemMetaSnapshot meta, boolean checkLore) {
Optional<String> displayName = meta.getDisplayName();
private static boolean equalsItemMeta(@Nonnull ItemMeta itemMeta, @Nonnull ItemMetaSnapshot itemMetaSnapshot, boolean checkLore) {
Optional<String> displayName = itemMetaSnapshot.getDisplayName();
if (itemMeta.hasDisplayName() != displayName.isPresent()) {
return false;
} else if (itemMeta.hasDisplayName() && displayName.isPresent() && !itemMeta.getDisplayName().equals(displayName.get())) {
return false;
} else if (checkLore) {
Optional<List<String>> itemLore = meta.getLore();
Optional<List<String>> itemLore = itemMetaSnapshot.getLore();
if (itemMeta.hasLore() && itemLore.isPresent() && !equalsLore(itemMeta.getLore(), itemLore.get())) {
return false;
@ -332,7 +332,7 @@ public final class SlimefunUtils {
}
// Fixes #3133: name and lore are not enough
OptionalInt itemCustomModelData = meta.getCustomModelData();
OptionalInt itemCustomModelData = itemMetaSnapshot.getCustomModelData();
if (itemMeta.hasCustomModelData() && itemCustomModelData.isPresent() && itemMeta.getCustomModelData() != itemCustomModelData.getAsInt()) {
return false;
} else {