Magic: bugfix spawn ethereal item effect (#78332)

* fix etheral_item effect to put items on players again * astyle
CleverRaven · Dec 4, 2024 · c2fdece · c2fdece
1 parent b0f3322
commit c2fdece
Showing 1 changed file with 18 additions and 20 deletions.
diff --git a/src/magic_spell_effect.cpp b/src/magic_spell_effect.cpp
@@ -1168,7 +1168,7 @@ void spell_effect::directed_push( const spell &sp, Creature &caster, const tripo
 void spell_effect::spawn_ethereal_item( const spell &sp, Creature &caster,
                                         const tripoint_bub_ms &center )
 {
-    Character *const character_at_target = get_creature_tracker().creature_at<npc>( center );
+    Character *character_at_target = get_creature_tracker().creature_at<Character>( center );
 
     std::vector<item> granted;
 
@@ -1183,18 +1183,30 @@ void spell_effect::spawn_ethereal_item( const spell &sp, Creature &caster,
         }
     }
 
-    avatar &player_character = get_avatar();
-    if( character_at_target == nullptr ) {
+    if( character_at_target != nullptr ) {
         for( item &it : granted ) {
             // Spawned items are ethereal unless permanent and max level. Comestibles are never ethereal.
             if( !it.is_comestible() && !sp.has_flag( spell_flag::PERMANENT_ALL_LEVELS ) &&
                 !( sp.has_flag( spell_flag::PERMANENT ) && sp.is_max_level( caster ) ) ) {
                 it.set_var( "ethereal", to_turns<int>( sp.duration_turns( caster ) ) );
                 it.ethereal = true;
             }
-            get_map().add_item_or_charges( center, it );
-        }
 
+            if( it.ethereal && character_at_target->is_wearing( it.typeId() ) ) {
+                // Ethereal equipment already exists so just update its duration
+                item *existing_item = character_at_target->item_worn_with_id( it.typeId() );
+                existing_item->set_var( "ethereal", to_turns<int>( sp.duration_turns( caster ) ) );
+            } else if( character_at_target->can_wear( it ).success() ) {
+                it.set_flag( json_flag_FIT );
+                character_at_target->wear_item( it, false );
+            } else if( !character_at_target->has_wield_conflicts( it ) &&
+                       !character_at_target->martial_arts_data->keep_hands_free && //No wield if hands free
+                       character_at_target->wield( it ) ) {
+                // nothing to do
+            } else {
+                character_at_target->i_add( it );
+            }
+        }
     } else {
         for( item &it : granted ) {
             // Spawned items are ethereal unless permanent and max level. Comestibles are never ethereal.
@@ -1203,21 +1215,7 @@ void spell_effect::spawn_ethereal_item( const spell &sp, Creature &caster,
                 it.set_var( "ethereal", to_turns<int>( sp.duration_turns( caster ) ) );
                 it.ethereal = true;
             }
-
-            if( it.ethereal && player_character.is_wearing( it.typeId() ) ) {
-                // Ethereal equipment already exists so just update its duration
-                item *existing_item = player_character.item_worn_with_id( it.typeId() );
-                existing_item->set_var( "ethereal", to_turns<int>( sp.duration_turns( caster ) ) );
-            } else if( player_character.can_wear( it ).success() ) {
-                it.set_flag( json_flag_FIT );
-                player_character.wear_item( it, false );
-            } else if( !player_character.has_wield_conflicts( it ) &&
-                       !player_character.martial_arts_data->keep_hands_free && //No wield if hands free
-                       player_character.wield( it, 0 ) ) {
-                // nothing to do
-            } else {
-                player_character.i_add( it );
-            }
+            get_map().add_item_or_charges( center, it );
         }
     }
     sp.make_sound( caster.pos_bub(), caster );