Fix petrelease-villager-bug

Jakllp · Jakllp · commit b56666f39629 · 2024-12-13T01:32:54.000+01:00
diff --git a/modules/v1_20_R4/src/main/java/de/Keyle/MyPet/compat/v1_20_R4/services/EntityConverterService.java b/modules/v1_20_R4/src/main/java/de/Keyle/MyPet/compat/v1_20_R4/services/EntityConverterService.java
@@ -208,8 +208,10 @@ public void convertEntity(MyPet myPet, LivingEntity normalEntity) {
                         TagCompound offersTag = villagerTag.get("Offers");
                         CompoundTag vanillaNBT = (CompoundTag) ItemStackNBTConverter.compoundToVanillaCompound(offersTag);
                         DataResult<MerchantOffers> dataresult = MerchantOffers.CODEC.parse(entityVillager.registryAccess().createSerializationContext(NbtOps.INSTANCE), vanillaNBT.get("Offers"));
-                        if(dataresult.hasResultOrPartial() && dataresult.resultOrPartial().isPresent()) {
+                        try {
                             entityVillager.setOffers(dataresult.resultOrPartial().get());
+                        } catch (Exception e) {
+                            e.printStackTrace();
                         }
                     }
                     if (villagerTag.containsKey("Inventory")) {

Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,10 @@ public void convertEntity(MyPet myPet, LivingEntity normalEntity) {`
`208`	`208`	`TagCompound offersTag = villagerTag.get("Offers");`
`209`	`209`	`CompoundTag vanillaNBT = (CompoundTag) ItemStackNBTConverter.compoundToVanillaCompound(offersTag);`
`210`	`210`	`DataResult<MerchantOffers> dataresult = MerchantOffers.CODEC.parse(entityVillager.registryAccess().createSerializationContext(NbtOps.INSTANCE), vanillaNBT.get("Offers"));`
`211`		`- if(dataresult.hasResultOrPartial() && dataresult.resultOrPartial().isPresent()) {`
	`211`	`+ try {`
`212`	`212`	`entityVillager.setOffers(dataresult.resultOrPartial().get());`
	`213`	`+ } catch (Exception e) {`
	`214`	`+ e.printStackTrace();`
`213`	`215`	`}`
`214`	`216`	`}`
`215`	`217`	`if (villagerTag.containsKey("Inventory")) {`