From 51658512c8c68a788c58306aeb4dac74abd9212c Mon Sep 17 00:00:00 2001 From: NotThorny Date: Sat, 28 Jan 2023 02:26:11 -0700 Subject: [PATCH 1/2] Fix Sumeru Main House bricking accounts This is only for the house, not the full realm --- 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)); } From ccd61e8fd07f4cfe163779079e643d65ea159cde Mon Sep 17 00:00:00 2001 From: Thoronium <107363768+NotThorny@users.noreply.github.com> Date: Sat, 28 Jan 2023 03:28:58 -0700 Subject: [PATCH 2/2] Fixed realm 5 Main house needs to be placed manually for Sumeru realm (module 5) as the resources for defaults in Sumeru realm are missing. Sumeru main house cannot be exited from the door, issue due to the same missing res. --- .../game/props/ItemUseAction/ItemUseUnlockHomeModule.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseUnlockHomeModule.java b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseUnlockHomeModule.java index 8da9aba24..7e679f36f 100644 --- a/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseUnlockHomeModule.java +++ b/src/main/java/emu/grasscutter/game/props/ItemUseAction/ItemUseUnlockHomeModule.java @@ -20,11 +20,6 @@ public class ItemUseUnlockHomeModule extends ItemUseInt { @Override public boolean postUseItem(UseItemParams params){ - // Realm 5 will break all homes, so blacklist for now - if(this.i == 5){ - return false; - } - params.player.addRealmList(this.i); return true; }