fix serenitea pot main building

GoJam11 · Sep 2, 2022 · f93d998 · f93d998
1 parent 735b48e
commit f93d998
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git 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 static class HomeBlock{
         @SerializedName(value = "FGIJCELCGFI", alternate = "PGDPDIDJEEL")
         int blockId;
 
-        @SerializedName(value = "BEAPOFELABD", alternate = "MLIODLGDFHJ")
+        @SerializedName("BEAPOFELABD")
         List<HomeFurniture> furnitures;
+
+        @SerializedName("MLIODLGDFHJ")
+        List<HomeFurniture> persistentFurnitures;
     }
 
     @Data

diff --git 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 static HomeBlockItem parseFrom(HomeworldDefaultSaveData.HomeBlock homeBlo
                                 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();
     }
 }