From b2eda34079886297bae8e932a673ff207dfbc636 Mon Sep 17 00:00:00 2001 From: NotThorny Date: Sat, 28 Jan 2023 02:26:11 -0700 Subject: [PATCH] Fix Grass main house bricking accounts --- src/main/java/emu/grasscutter/game/home/GameHome.java | 5 ++++- .../server/packet/recv/HandlerHomeModuleSeenReq.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/home/GameHome.java b/src/main/java/emu/grasscutter/game/home/GameHome.java index 3f3d9b9f8..f99a71b79 100644 --- a/src/main/java/emu/grasscutter/game/home/GameHome.java +++ b/src/main/java/emu/grasscutter/game/home/GameHome.java @@ -69,8 +69,11 @@ public class GameHome { if (defaultItem != null) { Grasscutter.getLogger().info("Set player {} home {} to initial setting", ownerUid, sceneId); return HomeSceneItem.parseFrom(defaultItem, sceneId); + }else{ + // Sumeru res missing bricks account, use default realm data to allow main house in other realms + defaultItem = GameData.getHomeworldDefaultSaveData().get(2001); + return HomeSceneItem.parseFrom(defaultItem, sceneId); } - return null; }); } diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeModuleSeenReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeModuleSeenReq.java index 01bd11f1f..5bc223818 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeModuleSeenReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerHomeModuleSeenReq.java @@ -13,7 +13,7 @@ public class HandlerHomeModuleSeenReq extends PacketHandler { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { var req = HomeModuleSeenReq.parseFrom(payload); var seen = req.getSeenModuleIdListList(); - + // TODO: Make 'seen' status persist session.send(new PacketHomeModuleSeenRsp(seen)); }