Fix home nulls (#2355)

* Add null checking * Sanity check for moduleManager
Grasscutters · Sep 12, 2023 · 5fd31ae · 5fd31ae
1 parent 8de281d
commit 5fd31ae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/main/java/emu/grasscutter/game/home/HomeModuleManager.java b/src/main/java/emu/grasscutter/game/home/HomeModuleManager.java
@@ -41,12 +41,20 @@ public HomeModuleManager(HomeWorld homeWorld) {
     }
 
     public void tick() {
+        if (this.moduleId == 0) {
+            return;
+        }
+
         this.outdoor.onTick();
         this.indoor.onTick();
         this.summonEvents.removeIf(HomeAvatarSummonEvent::isTimeOver);
     }
 
     public void refreshMainHouse() {
+        if (this.moduleId == 0) {
+            return;
+        }
+
         this.indoor = this.homeWorld.getSceneById(this.homeWorld.getActiveIndoorSceneId());
     }
 
@@ -67,6 +75,7 @@ private void fireAllAvatarRewardEvent() {
         var suites =
                 allBlockItems.stream()
                         .map(HomeBlockItem::getSuiteList)
+                        .filter(Objects::nonNull)
                         .flatMap(Collection::stream)
                         .distinct()
                         .toList();
@@ -210,6 +219,10 @@ public HomeSceneItem getIndoorSceneItem() {
     }
 
     public void onSetModule() {
+        if (this.moduleId == 0) {
+            return;
+        }
+
         this.outdoor.addEntities(this.getOutdoorSceneItem().getAnimals(this.outdoor));
         this.indoor.addEntities(this.getIndoorSceneItem().getAnimals(this.indoor));
         this.fireAllAvatarRewardEvent();

diff --git a/src/main/java/emu/grasscutter/game/home/HomeWorld.java b/src/main/java/emu/grasscutter/game/home/HomeWorld.java
@@ -29,6 +29,9 @@ public HomeWorld(GameServer server, Player owner) {
 
     @Override
     public boolean onTick() {
+        if (this.moduleManager == null) {
+            return false;
+        }
         this.moduleManager.tick();
 
         if (this.getTickCount() % 10 == 0) {