fix upmarmu being server-wide

1 files changed, 16 insertions, 0 deletions

diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index 8dc1989..6f98d9d 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -2429,6 +2429,10 @@ void builtin_overrideattack(ScriptState *st)
     dumb_ptr<map_session_data> sd = script_rid2sd(st);
     script_nullpo_end(sd, "player not found");
 
+    //printf("inside override attack!");
+    PRINTF("inside override attack!!\n"_fmt);
+
+
     if (HARG(0))
     {
         interval_t attack_delay = static_cast<interval_t>(conv_num(st, &AARG(0)));
@@ -2441,6 +2445,16 @@ void builtin_overrideattack(ScriptState *st)
         extract(event_, &event);
 
         sd->attack_spell_override = st->oid;
+
+        // PRINTF("inside HARG!\n"_fmt);
+        // PRINTF("oid: %i\n"_fmt, st->oid._value);
+        // PRINTF("char_id: %i\n"_fmt, sd->char_id_._value);
+        // PRINTF("login_id: %i login_id2: %i\n"_fmt, sd->login_id1, sd->login_id2);
+        // PRINTF("npc_id: %i\n"_fmt, sd->npc_id._value);      
+        // PRINTF("attack_spell_override: %i\n"_fmt, sd->attack_spell_override._value);      
+        // printf("magic_attack.npc: %s\n", sd->magic_attack.npc.c_str());      
+        // printf("magic_attack.label: %s\n", sd->magic_attack.label.c_str());      
+
         sd->attack_spell_charges = HARG(5) ? conv_num(st, &AARG(5)) : 1;
         sd->magic_attack = event;
         pc_set_weapon_icon(sd, 1, icon, look);
@@ -2450,6 +2464,8 @@ void builtin_overrideattack(ScriptState *st)
     {
         // explicit discharge
         sd->attack_spell_override = BlockId();
+        PRINTF("outside HARG!\n"_fmt);
+        PRINTF("oid: %i\n"_fmt, sd->attack_spell_override._value);
         pc_set_weapon_icon(sd, 0, StatusChange::ZERO, ItemNameId());
         pc_set_attack_info(sd, interval_t::zero(), 0);
         pc_calcstatus(sd, (int)CalcStatusKind::NORMAL_RECALC);