Follow up to 9333921

Thanks to @Playtester's friend Ash for reporting this.
rathena · Dec 13, 2016 · 7df9962 · 7df9962 · Lemongrass3110 · Dec 15, 2016
1 parent d095fe7
commit 7df9962
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/map/script.c b/src/map/script.c
@@ -7801,16 +7801,17 @@ BUILDIN_FUNC(readparam)
 
 	if( script_hasdata(st, 3) ){
 		if( script_isint(st, 3) ){
-			if( !script_charid2sd(3, sd) ){
-				script_pushint(st, -1);
-				return SCRIPT_CMD_FAILURE;
-			}
+			script_charid2sd(3, sd);
 		}else{
-			if( !script_nick2sd(3, sd) ){
-				script_pushint(st, -1);
-				return SCRIPT_CMD_FAILURE;
-			}
+			script_nick2sd(3, sd);
 		}
+	}else{
+		sd = script_rid2sd(st);
+	}
+
+	if( !sd ){
+		script_pushint(st, -1);
+		return SCRIPT_CMD_FAILURE;
 	}
 
 	// If you use a parameter, return the value behind it