From 82ed67a01c6e515ded960b153daf892b7a606211 Mon Sep 17 00:00:00 2001 From: aleos Date: Tue, 26 Sep 2017 16:46:13 -0400 Subject: [PATCH] Corrected script command instance ID lookups * Fixes #2448. * Resolves script_instancegetid causing scripts to end prematurely during player lookups. Thanks to @Yuchinin and @Atemo! --- src/map/script.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/script.cpp b/src/map/script.cpp index aa7e2f8c96..d5be46da7f 100644 --- a/src/map/script.cpp +++ b/src/map/script.cpp @@ -19718,7 +19718,7 @@ unsigned short script_instancegetid(struct script_state* st) struct guild *gd = NULL; struct clan *cd = NULL; - if (script_rid2sd(sd)) { + if ((sd = map_id2sd(st->rid))) { if (sd->instance_id) instance_id = sd->instance_id; if (instance_id == 0 && sd->status.party_id && (pd = party_search(sd->status.party_id)) != NULL && pd->instance_id)