From f5d81d8f0ed0b50f6434eaa14c39bcb6635f5ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=A1=E7=81=B5=E6=9A=B4=E9=BE=99=E5=A4=A7=E5=B8=9D?= Date: Wed, 3 Jul 2024 00:12:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=9C=8D=E4=B8=80=E6=AE=B5=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=90=8Escene=E7=9A=84=E5=80=BC=E4=BC=9A=E5=8F=98?= =?UTF-8?q?=E6=88=90null=20=E6=9A=82=E6=97=B6=E5=85=88=E8=A7=82=E5=AF=9F?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E8=BF=99=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grasscutter/game/entity/EntityAvatar.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java b/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java index 2bff768bae6..c1a6a6016a4 100644 --- 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();