开服一段时间后scene的值会变成null 暂时先观察定位这里

HongchengQ · Jul 2, 2024 · f5d81d8 · f5d81d8
1 parent baa5da8
commit f5d81d8
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java b/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
@@ -49,7 +49,27 @@ public EntityAvatar(Scene scene, Avatar avatar) {
         this.avatar = avatar;
         this.avatar.setCurrentEnergy();
 
-        if (scene != null) {
+//        if (scene != null) {
+//            var world = scene.getWorld();
+//            this.id = world.getNextEntityId(EntityIdType.AVATAR);
+//
+//            var weapon = this.getAvatar().getWeapon();
+//            if (weapon != null) {
+//                if (!(weapon.getWeaponEntity() != null && weapon.getWeaponEntity().getScene() == scene)) {
+//                    weapon.setWeaponEntity(
+//                            new EntityWeapon(this.getPlayer().getScene(), weapon.getItemData().getGadgetId()));
+//                    scene.getWeaponEntities().put(weapon.getWeaponEntity().getId(), weapon.getWeaponEntity());
+//                }
+//            }
+//        } else {
+//            Grasscutter.getLogger()
+//                    .error("Unable to create EntityAvatar instance; provided scene is null. 使用默认值scene3");
+//        }
+
+        if (scene == null) {
+            Grasscutter.getLogger().error("Unable to create EntityAvatar instance; provided scene is null.");
+        }
+
             var world = scene.getWorld();
             this.id = world.getNextEntityId(EntityIdType.AVATAR);
 
@@ -61,10 +81,6 @@ public EntityAvatar(Scene scene, Avatar avatar) {
                     scene.getWeaponEntities().put(weapon.getWeaponEntity().getId(), weapon.getWeaponEntity());
                 }
             }
-        } else {
-            Grasscutter.getLogger()
-                    .error("Unable to create EntityAvatar instance; provided scene is null.");
-        }
 
         this.initAbilities();