From 0fc4fb146a27cdf61dfe1bceaef70ee7b82550ce Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 18 May 2024 17:27:43 -0300
Subject: Fix some CI issues, and a bug in @grantpower

---
 npc/commands/grantpower.txt | 11 ++++++-----
 npc/functions/captcha.txt   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'npc')

diff --git a/npc/commands/grantpower.txt b/npc/commands/grantpower.txt
index a68e11d00..b059a9155 100644
--- a/npc/commands/grantpower.txt
+++ b/npc/commands/grantpower.txt
@@ -51,20 +51,21 @@ OnCall:
         getitembound .@ite, 1, 1; // Account bound or char bound? (1 or 4)
         dispbottom l("You received the @@ from @@.", getitemlink(.@ite), strcharinfo(0, "someone", .@ori));
         consoleinfo("%s is the new owner for the %s.", strcharinfo(0), getitemname(.@ite));
+        .@request$ = strcharinfo(0);
         detachrid();
         attachrid(.@ori);
         delitem .@ite, 1;
         switch (.@ite) {
             case DemureAxe:
-                $DEMUR_HOLDER$ = strcharinfo(0); break;
+                $DEMUR_HOLDER$ = .@request$; break;
             case Tyranny:
-                $TYRAN_HOLDER$ = strcharinfo(0); break;
+                $TYRAN_HOLDER$ = .@request$; break;
             case Runestaff:
-                $RUNES_HOLDER$ = strcharinfo(0); break;
+                $RUNES_HOLDER$ = .@request$; break;
             case AegisShield:
-                $AEGIS_HOLDER$ = strcharinfo(0); break;
+                $AEGIS_HOLDER$ = .@request$; break;
             case Blightbringer:
-                $SHADY_HOLDER$ = strcharinfo(0); break;
+                $SHADY_HOLDER$ = .@request$; break;
             default:
                 Exception("Invalid legendary item "+str(.@ite),
                           RB_DEFAULT|RB_IRCBROADCAST); break;
diff --git a/npc/functions/captcha.txt b/npc/functions/captcha.txt
index 7fce7ff70..074326ca9 100644
--- a/npc/functions/captcha.txt
+++ b/npc/functions/captcha.txt
@@ -189,7 +189,7 @@ OnClinic:
     @treatcaptcha = gettimetick(2);
     closeclientdialog;
     // Attach the one you intend to heal
-    if (attachplayer(.@id)) {
+    if (attachrid(.@id)) {
         // Not infected, so do nothing
         if (!getstatus(SC_BOTTER_SYNDROME))
             end;
-- 
cgit v1.2.3-70-g09d2