Merge pull request #3243 from csnv/fix/attachrid-autoloot

Disable attaching scripts to characters in autotrade
HerculesWS · Nov 20, 2023 · ed2c554 · ed2c554
2 parents 9119653 + b3b3d94
commit ed2c554
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/map/script.c b/src/map/script.c
@@ -14418,15 +14418,21 @@ static void script_detach_rid(struct script_state *st)
 static BUILDIN(attachrid)
 {
 	int rid = script_getnum(st,2);
+	struct map_session_data *sd = map->id2sd(rid);
 
-	if (map->id2sd(rid) != NULL) {
+	if (sd != NULL) {
+		if (sd->state.autotrade) {
+			ShowError("buildin_attachrid: Cannot attach script to character in autotrade\n");
+			script_pushint(st, 0);
+			return false;
+		}
 		script->detach_rid(st);
 
 		st->rid = rid;
 		script->attach_state(st);
-		script_pushint(st,1);
+		script_pushint(st, 1);
 	} else
-		script_pushint(st,0);
+		script_pushint(st, 0);
 	return true;
 }
 /*==========================================