fix costume switch

Grasscutters · Dec 22, 2022 · c88fd29 · c88fd29
1 parent 6ee37a3
commit c88fd29
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java b/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java
@@ -54,12 +54,14 @@ public EntityAvatar(Scene scene, Avatar avatar) {
         super(scene);
         this.avatar = avatar;
         this.avatar.setCurrentEnergy();
-        if (scene != null)
+        if (getScene() != null)
+        {
             this.id = getScene().getWorld().getNextEntityId(EntityIdType.AVATAR);
 
-        GameItem weapon = this.getAvatar().getWeapon();
-        if (weapon != null) {
-            weapon.setWeaponEntityId(getScene().getWorld().getNextEntityId(EntityIdType.WEAPON));
+            GameItem weapon = getAvatar().getWeapon();
+            if (weapon != null) {
+                weapon.setWeaponEntityId(getScene().getWorld().getNextEntityId(EntityIdType.WEAPON));
+            }
         }
     }