From f93d998ff01f739e8ae50027bba5f0e3ab91a7bb Mon Sep 17 00:00:00 2001 From: pfyy <112098515+pfyy@users.noreply.github.com> Date: Fri, 2 Sep 2022 22:24:43 +0800 Subject: [PATCH] fix serenitea pot main building --- .../grasscutter/data/binout/HomeworldDefaultSaveData.java | 5 ++++- src/main/java/emu/grasscutter/game/home/HomeBlockItem.java | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java b/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java index 04506f016..833d50294 100644 --- a/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java +++ b/src/main/java/emu/grasscutter/data/binout/HomeworldDefaultSaveData.java @@ -34,8 +34,11 @@ public class HomeworldDefaultSaveData { @SerializedName(value = "FGIJCELCGFI", alternate = "PGDPDIDJEEL") int blockId; - @SerializedName(value = "BEAPOFELABD", alternate = "MLIODLGDFHJ") + @SerializedName("BEAPOFELABD") List furnitures; + + @SerializedName("MLIODLGDFHJ") + List persistentFurnitures; } @Data diff --git a/src/main/java/emu/grasscutter/game/home/HomeBlockItem.java b/src/main/java/emu/grasscutter/game/home/HomeBlockItem.java index 6e9dabc46..e43968d30 100644 --- a/src/main/java/emu/grasscutter/game/home/HomeBlockItem.java +++ b/src/main/java/emu/grasscutter/game/home/HomeBlockItem.java @@ -75,9 +75,13 @@ public class HomeBlockItem { homeBlock.getFurnitures().stream() .map(HomeFurnitureItem::parseFrom) .toList()) + .persistentFurnitureList( + homeBlock.getPersistentFurnitures() == null ? List.of() : + homeBlock.getPersistentFurnitures().stream() + .map(HomeFurnitureItem::parseFrom) + .toList()) .deployAnimalList(List.of()) .deployNPCList(List.of()) - .persistentFurnitureList(List.of()) .build(); } }