summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2024-05-18 17:27:43 -0300
committerJesusaves <cpntb1@ymail.com>2024-05-18 17:27:43 -0300
commit0fc4fb146a27cdf61dfe1bceaef70ee7b82550ce (patch)
tree5a4bfaba1ce03765f9ecd618df71cebcc0a25a32
parent22009abf953489dcd8b30eec439aa33aa753851b (diff)
downloadserverdata-0fc4fb146a27cdf61dfe1bceaef70ee7b82550ce.tar.gz
serverdata-0fc4fb146a27cdf61dfe1bceaef70ee7b82550ce.tar.bz2
serverdata-0fc4fb146a27cdf61dfe1bceaef70ee7b82550ce.tar.xz
serverdata-0fc4fb146a27cdf61dfe1bceaef70ee7b82550ce.zip
Fix some CI issues, and a bug in @grantpower
-rw-r--r--npc/commands/grantpower.txt11
-rw-r--r--npc/functions/captcha.txt2
2 files changed, 7 insertions, 6 deletions
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;