From 93246a07308c73630db4708780c244e3558b819f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 2 May 2025 19:43:06 +0100 Subject: [PATCH] Fix errors when loading raid files without a PDC --- .../sources/net/minecraft/world/entity/raid/Raid.java.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/paper-server/patches/sources/net/minecraft/world/entity/raid/Raid.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/raid/Raid.java.patch index 752fef308..8d1b3bca2 100644 --- a/paper-server/patches/sources/net/minecraft/world/entity/raid/Raid.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/entity/raid/Raid.java.patch @@ -17,7 +17,7 @@ Raid.RaidStatus.CODEC.fieldOf("status").forGetter(raid -> raid.status), BlockPos.CODEC.fieldOf("center").forGetter(raid -> raid.center), UUIDUtil.CODEC_SET.fieldOf("heroes_of_the_village").forGetter(raid -> raid.heroesOfTheVillage) -+ , org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer.createCodec(PDC_TYPE_REGISTRY).fieldOf(PDC_NBT_KEY).forGetter(raid -> raid.persistentDataContainer) ++ , org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer.createCodec(PDC_TYPE_REGISTRY).lenientOptionalFieldOf(PDC_NBT_KEY).forGetter(raid -> java.util.Optional.of(raid.persistentDataContainer)) ) .apply(instance, Raid::new) ); @@ -33,7 +33,7 @@ Raid.RaidStatus status, BlockPos center, Set heroesOfTheVillage -+ , final org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer persistentDataContainer // Paper - add persistent data container ++ , final Optional persistentDataContainer // Paper - add persistent data container ) { this.started = started; this.active = active; @@ -41,7 +41,7 @@ this.numGroups = numGroups; this.status = status; this.heroesOfTheVillage.addAll(heroesOfTheVillage); -+ this.persistentDataContainer = persistentDataContainer; // Paper - add persistent data container ++ this.persistentDataContainer = persistentDataContainer.orElseGet(() -> new org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer(PDC_TYPE_REGISTRY)); // Paper - add persistent data container } public boolean isOver() {