From bd03c76fd6a6ad90037cf752b7f2417a3d5306c5 Mon Sep 17 00:00:00 2001 From: Raycoms Date: Mon, 19 Aug 2024 19:10:22 +0200 Subject: [PATCH] hotfix loading issues --- .../java/com/minecolonies/core/colony/VisitorData.java | 9 +++++---- .../core/colony/managers/VisitorManager.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/minecolonies/core/colony/VisitorData.java b/src/main/java/com/minecolonies/core/colony/VisitorData.java index 6caa915a071..388d15534eb 100644 --- a/src/main/java/com/minecolonies/core/colony/VisitorData.java +++ b/src/main/java/com/minecolonies/core/colony/VisitorData.java @@ -82,14 +82,15 @@ public ItemStack getRecruitCost() /** * Loads this citizen data from nbt * - * @param colony colony to load for - * @param nbt nbt compound to read from + * @param colony colony to load for + * @param nbt nbt compound to read from + * @param provider * @return new CitizenData */ - public static IVisitorData loadVisitorFromNBT(final IColony colony, final CompoundTag nbt) + public static IVisitorData loadVisitorFromNBT(final IColony colony, final CompoundTag nbt, final HolderLookup.@NotNull Provider provider) { final IVisitorData data = new VisitorData(nbt.getInt(TAG_ID), colony); - data.deserializeNBT(colony.getWorld().registryAccess(), nbt); + data.deserializeNBT(provider, nbt); return data; } diff --git a/src/main/java/com/minecolonies/core/colony/managers/VisitorManager.java b/src/main/java/com/minecolonies/core/colony/managers/VisitorManager.java index 2f18bdf13d4..ec630e5364c 100644 --- a/src/main/java/com/minecolonies/core/colony/managers/VisitorManager.java +++ b/src/main/java/com/minecolonies/core/colony/managers/VisitorManager.java @@ -139,7 +139,7 @@ public void read(@NotNull final HolderLookup.Provider provider, @NotNull final C final ListTag citizenList = visitorManagerNBT.getList(TAG_VISITORS, Tag.TAG_COMPOUND); for (final Tag citizen : citizenList) { - final IVisitorData data = VisitorData.loadVisitorFromNBT(colony, (CompoundTag) citizen); + final IVisitorData data = VisitorData.loadVisitorFromNBT(colony, (CompoundTag) citizen, provider); visitorMap.put(data.getId(), data); }