From 375750fca63edaaef7db3840fa5ba7bbf3ee968e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Sat, 24 Aug 2024 17:39:08 +0200 Subject: [PATCH] Data fix for previous bug --- gradle.properties | 2 +- .../systems/brn/servershop/lib/storages/PriceStorage.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 567314c..39213e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.21.1 yarn_mappings=1.21.1+build.3 loader_version=0.16.2 # Mod Properties -mod_version=1.4.7 +mod_version=1.4.8 maven_group=systems.brn archives_base_name=servershop # Dependencies diff --git a/src/main/java/systems/brn/servershop/lib/storages/PriceStorage.java b/src/main/java/systems/brn/servershop/lib/storages/PriceStorage.java index 8fa25e2..a1114cb 100644 --- a/src/main/java/systems/brn/servershop/lib/storages/PriceStorage.java +++ b/src/main/java/systems/brn/servershop/lib/storages/PriceStorage.java @@ -16,6 +16,8 @@ import java.util.Scanner; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; +import static systems.brn.servershop.lib.Util.hasPrices; + public class PriceStorage { public final MinecraftServer server; @@ -86,7 +88,7 @@ public class PriceStorage { for (NbtElement element : nbtList) { if (element instanceof NbtCompound nbt) { ItemPriceRecord itemPriceRecord = ItemPriceRecord.fromNbt(nbt, wrapperLookup); - if (itemPriceRecord.stack() != null) { + if (itemPriceRecord.stack() != null && !hasPrices(itemPriceRecord.stack())) { prices.put(itemPriceRecord.stack(), itemPriceRecord); } }