fix: NPE related to teapot when player logs in. (#2429)

* fix: NPE related to home when player logs in.

* fix: NPE related to home when player logs in.

* forgot to save player after fixing module id

src/main/java/emu/grasscutter/game/home/HomeModuleManager.java

@@ -1,22 +1,25 @@
 package emu.grasscutter.game.home;
 
 import com.github.davidmoten.guavamini.Lists;
+import emu.grasscutter.game.home.suite.HomeSuiteItem;
 import emu.grasscutter.game.home.suite.event.HomeAvatarRewardEvent;
 import emu.grasscutter.game.home.suite.event.HomeAvatarSummonEvent;
 import emu.grasscutter.game.home.suite.event.SuiteEventType;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.proto.HomeAvatarRewardEventNotifyOuterClass;
-import emu.grasscutter.net.proto.HomeAvatarSummonAllEventNotifyOuterClass;
-import emu.grasscutter.net.proto.RetcodeOuterClass;
+import emu.grasscutter.net.proto.HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify;
+import emu.grasscutter.net.proto.HomeAvatarSummonAllEventNotifyOuterClass.HomeAvatarSummonAllEventNotify;
+import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.server.packet.send.PacketHomeAvatarSummonAllEventNotify;
 import emu.grasscutter.utils.Either;
-import java.util.*;
-import java.util.stream.Stream;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.experimental.FieldDefaults;
 
+import javax.annotation.Nullable;
+import java.util.*;
+import java.util.stream.Stream;
+
 @Getter
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class HomeModuleManager {
@@ -24,7 +27,9 @@ public class HomeModuleManager {
     final HomeWorld homeWorld;
     final GameHome home;
     final int moduleId;
+    @Nullable
     final HomeScene outdoor;
+    @Nullable
     HomeScene indoor;
     final List<HomeAvatarRewardEvent> rewardEvents;
     final List<HomeAvatarSummonEvent> summonEvents;
@@ -45,8 +50,14 @@ public class HomeModuleManager {
             return;
         }
 
-        this.outdoor.onTick();
-        this.indoor.onTick();
+        if (this.outdoor != null) {
+            this.outdoor.onTick();
+        }
+
+        if (this.indoor != null) {
+            this.indoor.onTick();
+        }
+
         this.summonEvents.removeIf(HomeAvatarSummonEvent::isTimeOver);
     }
 
@@ -66,44 +77,45 @@ public class HomeModuleManager {
     private void fireAllAvatarRewardEvents() {
         this.rewardEvents.clear();
         var allBlockItems =
-                Stream.of(this.getOutdoorSceneItem(), this.getIndoorSceneItem())
-                        .map(HomeSceneItem::getBlockItems)
-                        .map(Map::values)
-                        .flatMap(Collection::stream)
-                        .toList();
+            Stream.of(this.getOutdoorSceneItem(), this.getIndoorSceneItem())
+                .filter(Objects::nonNull)
+                .map(HomeSceneItem::getBlockItems)
+                .map(Map::values)
+                .flatMap(Collection::stream)
+                .toList();
 
         var suites =
-                allBlockItems.stream()
-                        .map(HomeBlockItem::getSuiteList)
-                        .filter(Objects::nonNull)
-                        .flatMap(Collection::stream)
-                        .distinct()
-                        .toList();
+            allBlockItems.stream()
+                .map(HomeBlockItem::getSuiteList)
+                .filter(Objects::nonNull)
+                .flatMap(Collection::stream)
+                .distinct()
+                .toList();
 
         allBlockItems.stream()
-                .map(HomeBlockItem::getDeployNPCList)
-                .flatMap(Collection::stream)
-                .forEach(
-                        avatar -> {
-                            suites.forEach(
-                                    suite -> {
-                                        var data =
-                                                SuiteEventType.HOME_AVATAR_REWARD_EVENT.getEventDataFrom(
-                                                        avatar.getAvatarId(), suite.getSuiteId());
-                                        if (data == null || this.home.isRewardEventFinished(data.getId())) {
-                                            return;
-                                        }
+            .map(HomeBlockItem::getDeployNPCList)
+            .flatMap(Collection::stream)
+            .forEach(
+                avatar -> {
+                    suites.forEach(
+                        suite -> {
+                            var data =
+                                SuiteEventType.HOME_AVATAR_REWARD_EVENT.getEventDataFrom(
+                                    avatar.getAvatarId(), suite.getSuiteId());
+                            if (data == null || this.home.isRewardEventFinished(data.getId())) {
+                                return;
+                            }
 
-                                        this.rewardEvents.add(
-                                                new HomeAvatarRewardEvent(
-                                                        homeOwner,
-                                                        data.getId(),
-                                                        data.getRewardID(),
-                                                        data.getAvatarID(),
-                                                        data.getSuiteId(),
-                                                        suite.getGuid()));
-                                    });
+                            this.rewardEvents.add(
+                                new HomeAvatarRewardEvent(
+                                    homeOwner,
+                                    data.getId(),
+                                    data.getRewardID(),
+                                    data.getAvatarID(),
+                                    data.getSuiteId(),
+                                    suite.getGuid()));
                         });
+                });
 
         if (this.summonEvents != null) {
             var suiteIdList = this.rewardEvents.stream().map(HomeAvatarRewardEvent::getSuiteId).toList();
@@ -113,68 +125,71 @@ public class HomeModuleManager {
 
     private void cancelSummonEventsIfAvatarLeave() {
         var avatars =
-                Stream.of(this.getOutdoorSceneItem(), this.getIndoorSceneItem())
-                        .map(HomeSceneItem::getBlockItems)
-                        .map(Map::values)
-                        .flatMap(Collection::stream)
-                        .map(HomeBlockItem::getDeployNPCList)
-                        .flatMap(Collection::stream)
-                        .map(HomeNPCItem::getAvatarId)
-                        .toList();
+            Stream.of(this.getOutdoorSceneItem(), this.getIndoorSceneItem())
+                .filter(Objects::nonNull)
+                .map(HomeSceneItem::getBlockItems)
+                .map(Map::values)
+                .flatMap(Collection::stream)
+                .map(HomeBlockItem::getDeployNPCList)
+                .flatMap(Collection::stream)
+                .map(HomeNPCItem::getAvatarId)
+                .toList();
 
         this.summonEvents.removeIf(event -> !avatars.contains(event.getAvatarId()));
     }
 
     public Either<List<GameItem>, Integer> claimAvatarRewards(int eventId) {
         if (this.rewardEvents.isEmpty()) {
-            return Either.right(RetcodeOuterClass.Retcode.RET_FAIL_VALUE);
+            return Either.right(Retcode.RET_FAIL_VALUE);
         }
 
         var event = this.rewardEvents.remove(0);
         if (event.getEventId() != eventId) {
-            return Either.right(RetcodeOuterClass.Retcode.RET_FAIL_VALUE);
+            return Either.right(Retcode.RET_FAIL_VALUE);
         }
 
         if (!this.homeOwner.getHome().onClaimAvatarRewards(eventId)) {
-            return Either.right(RetcodeOuterClass.Retcode.RET_FAIL_VALUE);
+            return Either.right(Retcode.RET_FAIL_VALUE);
         }
 
         return Either.left(event.giveRewards());
     }
 
     public Either<HomeAvatarSummonEvent, Integer> fireAvatarSummonEvent(
-            Player owner, int avatarId, int guid, int suiteId) {
-        var targetSuite =
-                ((HomeScene) owner.getScene())
-                        .getSceneItem().getBlockItems().values().stream()
-                                .map(HomeBlockItem::getSuiteList)
-                                .flatMap(Collection::stream)
-                                .filter(suite -> suite.getGuid() == guid)
-                                .findFirst()
-                                .orElse(null);
+        Player owner, int avatarId, int guid, int suiteId) {
+        HomeSuiteItem targetSuite = null;
+        if (owner.getScene() instanceof HomeScene homeScene) {
+            targetSuite = homeScene
+                .getSceneItem().getBlockItems().values().stream()
+                .map(HomeBlockItem::getSuiteList)
+                .flatMap(Collection::stream)
+                .filter(suite -> suite.getGuid() == guid)
+                .findFirst()
+                .orElse(null);
+        }
 
         if (this.isInRewardEvent(avatarId)) {
-            return Either.right(RetcodeOuterClass.Retcode.RET_DUPLICATE_AVATAR_VALUE);
+            return Either.right(Retcode.RET_DUPLICATE_AVATAR_VALUE);
         }
 
         if (this.rewardEvents.stream().anyMatch(event -> event.getGuid() == guid)) {
-            return Either.right(RetcodeOuterClass.Retcode.RET_HOME_FURNITURE_GUID_ERROR_VALUE);
+            return Either.right(Retcode.RET_HOME_FURNITURE_GUID_ERROR_VALUE);
         }
 
         this.summonEvents.removeIf(event -> event.getGuid() == guid || event.getAvatarId() == avatarId);
 
         if (targetSuite == null) {
-            return Either.right(RetcodeOuterClass.Retcode.RET_HOME_CLIENT_PARAM_INVALID_VALUE);
+            return Either.right(Retcode.RET_HOME_CLIENT_PARAM_INVALID_VALUE);
         }
 
         var eventData = SuiteEventType.HOME_AVATAR_SUMMON_EVENT.getEventDataFrom(avatarId, suiteId);
         if (eventData == null) {
-            return Either.right(RetcodeOuterClass.Retcode.RET_HOME_CLIENT_PARAM_INVALID_VALUE);
+            return Either.right(Retcode.RET_HOME_CLIENT_PARAM_INVALID_VALUE);
         }
 
         var event =
-                new HomeAvatarSummonEvent(
-                        owner, eventData.getId(), eventData.getRewardID(), avatarId, suiteId, guid);
+            new HomeAvatarSummonEvent(
+                owner, eventData.getId(), eventData.getRewardID(), avatarId, suiteId, guid);
         this.summonEvents.add(event);
         owner.sendPacket(new PacketHomeAvatarSummonAllEventNotify(owner));
         return Either.left(event);
@@ -184,38 +199,39 @@ public class HomeModuleManager {
         this.summonEvents.removeIf(event -> event.getEventId() == eventId);
     }
 
-    public HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify toRewardEventProto() {
-        var notify = HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify.newBuilder();
+    public HomeAvatarRewardEventNotify toRewardEventProto() {
+        var notify = HomeAvatarRewardEventNotify.newBuilder();
         if (!this.rewardEvents.isEmpty()) {
             notify.setRewardEvent(this.rewardEvents.get(0).toProto()).setIsEventTrigger(true);
 
             notify.addAllPendingList(
-                    this.rewardEvents.subList(1, this.rewardEvents.size()).stream()
-                            .map(HomeAvatarRewardEvent::toProto)
-                            .toList());
+                this.rewardEvents.subList(1, this.rewardEvents.size()).stream()
+                    .map(HomeAvatarRewardEvent::toProto)
+                    .toList());
         }
 
         return notify.build();
     }
 
-    public HomeAvatarSummonAllEventNotifyOuterClass.HomeAvatarSummonAllEventNotify
-            toSummonEventProto() {
-        return HomeAvatarSummonAllEventNotifyOuterClass.HomeAvatarSummonAllEventNotify.newBuilder()
-                .addAllSummonEventList(
-                        this.summonEvents.stream().map(HomeAvatarSummonEvent::toProto).toList())
-                .build();
+    public HomeAvatarSummonAllEventNotify toSummonEventProto() {
+        return HomeAvatarSummonAllEventNotify.newBuilder()
+            .addAllSummonEventList(
+                this.summonEvents.stream().map(HomeAvatarSummonEvent::toProto).toList())
+            .build();
     }
 
     public boolean isInRewardEvent(int avatarId) {
         return this.rewardEvents.stream().anyMatch(e -> e.getAvatarId() == avatarId);
     }
 
+    @Nullable
     public HomeSceneItem getOutdoorSceneItem() {
-        return this.outdoor.getSceneItem();
+        return this.outdoor == null ? null : this.outdoor.getSceneItem();
     }
 
+    @Nullable
     public HomeSceneItem getIndoorSceneItem() {
-        return this.indoor.getSceneItem();
+        return this.indoor == null ? null : this.indoor.getSceneItem();
     }
 
     public void onSetModule() {
@@ -223,8 +239,14 @@ public class HomeModuleManager {
             return;
         }
 
-        this.outdoor.addEntities(this.getOutdoorSceneItem().getAnimals(this.outdoor));
-        this.indoor.addEntities(this.getIndoorSceneItem().getAnimals(this.indoor));
+        if (this.outdoor != null) {
+            this.outdoor.addEntities(this.getOutdoorSceneItem().getAnimals(this.outdoor));
+        }
+
+        if (this.indoor != null) {
+            this.indoor.addEntities(this.getIndoorSceneItem().getAnimals(this.indoor));
+        }
+
         this.fireAllAvatarRewardEvents();
     }
 
@@ -233,7 +255,12 @@ public class HomeModuleManager {
             return;
         }
 
-        this.outdoor.getEntities().clear();
-        this.indoor.getEntities().clear();
+        if (this.outdoor != null) {
+            this.outdoor.getEntities().clear();
+        }
+
+        if (this.indoor != null) {
+            this.indoor.getEntities().clear();
+        }
     }
 }