Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-16 17:05:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: arrangement of main house is duplicated even if player changes module (#2325)

Browse Source 
* fix: arrangement of main house is duplicated even if player change module

* removeIf

* Update src/main/java/emu/grasscutter/game/home/GameHome.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
This commit is contained in:
hamusuke
2023-09-03 00:52:56 +09:00
committed by GitHub
parent decf494234
commit ed97201473
9 changed files with 126 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/emu/grasscutter/game/home/HomeFurnitureItem.java
View File

@@ -5,6 +5,7 @@ import emu.grasscutter.data.GameData;
import emu.grasscutter.data.binout.HomeworldDefaultSaveData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.game.world.Position;
import emu.grasscutter.net.proto.*;
import java.util.Set;
import java.util.stream.Collectors;
@@ -65,7 +66,7 @@ public class HomeFurnitureItem implements HomeMarkPointProtoFactory {
}
public ItemData getAsItem() {
return GameData.getItemDataMap().get(this.furnitureId);
return this.furnitureId == 0 ? null : GameData.getItemDataMap().get(this.furnitureId);
}
public int getComfort() {